forked from github/server
fix crash when following a lost ship
This commit is contained in:
parent
802fe20897
commit
533a0aceec
|
@ -2279,7 +2279,7 @@ int follow_ship(unit * u, order * ord)
|
||||||
speed = maxspeed;
|
speed = maxspeed;
|
||||||
}
|
}
|
||||||
rc = rconnect(rc, dir);
|
rc = rconnect(rc, dir);
|
||||||
while (rc && rc != sh->region && moves < speed && (dir = hunted_dir(rc->attribs, id)) != NODIRECTION) {
|
while (rc && (!sh || rc != sh->region) && moves < speed && (dir = hunted_dir(rc->attribs, id)) != NODIRECTION) {
|
||||||
const char *loc = LOC(u->faction->locale, directions[dir]);
|
const char *loc = LOC(u->faction->locale, directions[dir]);
|
||||||
sbs_strcat(&sbcmd, " ");
|
sbs_strcat(&sbcmd, " ");
|
||||||
sbs_strcat(&sbcmd, loc);
|
sbs_strcat(&sbcmd, loc);
|
||||||
|
|
Loading…
Reference in New Issue