From 0c3126eb70a4d52f65692e9649e6f60a1a1b3a2b Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 16 Sep 2018 11:25:34 +0200 Subject: [PATCH] fix non-drifting ships crash --- src/move.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/move.c b/src/move.c index 70425b72e..227277ab6 100644 --- a/src/move.c +++ b/src/move.c @@ -855,7 +855,7 @@ static void drifting_ships(region * r) } } - if (firstu != NULL) { + if (rnext && firstu) { message *msg = msg_message("ship_drift", "ship dir", sh, dir); msg_to_ship_inmates(sh, &firstu, &lastu, msg); } @@ -873,7 +873,7 @@ static void drifting_ships(region * r) sink_ship(sh); remove_ship(shp, sh); } - else if (rnext != NULL) { + else if (rnext) { /* Das Schiff und alle Einheiten darin werden nun von r * nach rnext verschoben. Danach eine Meldung. */ add_regionlist(&route, rnext);