From af21ac537ebb61a3bbdc308c0348c506f7e03161 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 22 Jul 2008 23:29:08 +0000 Subject: (svn r13794) -Fix: helicopters leaving a heliport could get stuck after processing conditional orders. --- src/aircraft_cmd.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index dbdf6bd89..43ada5aad 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -1631,6 +1631,11 @@ static void AircraftEventHandler_AtTerminal(Vehicle *v, const AirportFTAClass *a 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; -- cgit v1.2.3-70-g09d2