mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r13794) -Fix: helicopters leaving a heliport could get stuck after processing conditional orders.

release/0.7
rubidium 2008-07-22 23:29:08 +00:00
parent 7cb5bf9c12
commit af21ac537e
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/aircraft_cmd.cpp
View File

@ -1631,6 +1631,11 @@ static void AircraftEventHandler_AtTerminal(Vehicle *v, const AirportFTAClass *a
v->u.air.state = (v->subtype == AIR_HELICOPTER) ? HELITAKEOFF : TAKEOFF; v->u.air.state = (v->subtype == AIR_HELICOPTER) ? HELITAKEOFF : TAKEOFF;
} }
break; 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 default: // orders have been deleted (no orders), goto depot and don't bother us
v->current_order.Free(); v->current_order.Free();
v->u.air.state = HANGAR; v->u.air.state = HANGAR;