Mercurial > hg > openttd
changeset 9688:5b73ae20c108 draft
(svn r13794) -Fix: helicopters leaving a heliport could get stuck after processing conditional orders.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Tue, 22 Jul 2008 23:29:08 +0000 |
| parents | d78b2ef46bf8 |
| children | a965eb2b1ebb |
| files | src/aircraft_cmd.cpp |
| diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -1631,6 +1631,11 @@ v->u.air.state = (v->subtype == AIR_HELICOPTER) ? HELITAKEOFF : TAKEOFF; } break; + case OT_CONDITIONAL: + /* In case of a conditional order we just have to wait a tick + * longer, so the conditional order can actually be processed; + * we should not clear the order as that makes us go nowhere. */ + return; default: // orders have been deleted (no orders), goto depot and don't bother us v->current_order.Free(); v->u.air.state = HANGAR;