Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Enno Rehling 2018-09-16 11:29:29 +02:00
parent 868499d941 cc034861c2
commit e46826a89c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/move.c
View File

@ -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); message *msg = msg_message("ship_drift", "ship dir", sh, dir);
msg_to_ship_inmates(sh, &firstu, &lastu, msg); msg_to_ship_inmates(sh, &firstu, &lastu, msg);
} }
@ -873,7 +873,7 @@ static void drifting_ships(region * r)
sink_ship(sh); sink_ship(sh);
remove_ship(shp, sh); remove_ship(shp, sh);
} }
else if (rnext != NULL) { else if (rnext) {
/* Das Schiff und alle Einheiten darin werden nun von r /* Das Schiff und alle Einheiten darin werden nun von r
* nach rnext verschoben. Danach eine Meldung. */ * nach rnext verschoben. Danach eine Meldung. */
add_regionlist(&route, rnext); add_regionlist(&route, rnext);