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

crash ROUTE & buildingowner

Browse source
This commit is contained in:
Enno Rehling 2009-12-26 07:46:33 +00:00
parent ab51cca539
commit f18f6f8ece
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/kernel/move.c
View file

@ -1961,6 +1961,10 @@ travel_i(unit * u, const region_list * route_begin, const region_list * route_en
{ {
region * r = u->region; region * r = u->region;
if (u->building && !can_leave(u)) {
cmistake(u, u->thisorder, 150, MSG_MOVE);
return route_begin;
}
switch (canwalk(u)) { switch (canwalk(u)) {
case E_CANWALK_TOOHEAVY: case E_CANWALK_TOOHEAVY:
cmistake(u, ord, 57, MSG_MOVE); cmistake(u, ord, 57, MSG_MOVE);

4
src/common/kernel/unit.c
View file

@ -843,7 +843,9 @@ boolean
leave(unit * u, boolean force) leave(unit * u, boolean force)
{ {
if (!force) { if (!force) {
if (!can_leave(u)) return false; if (!can_leave(u)) {
return false;
}
} }
if (u->building) leave_building(u); if (u->building) leave_building(u);
else if (u->ship) leave_ship(u); else if (u->ship) leave_ship(u);