Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'improved_breakdowns' into improved_breakdowns-sx

Browse Source
This commit is contained in:
Jonathan G Rennison 2016-03-22 22:10:19 +00:00
commit b59f1be235
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/aircraft_cmd.cpp
View File

@ -1124,11 +1124,23 @@ void FindBreakdownDestination(Aircraft *v)
if(destination != INVALID_STATION) { if(destination != INVALID_STATION) {
if(destination != v->current_order.GetDestination()) { if(destination != v->current_order.GetDestination()) {
v->current_order.MakeGoToDepot(destination, ODTFB_BREAKDOWN); v->current_order.MakeGoToDepot(destination, ODTFB_BREAKDOWN);
if (v->state == FLYING) {
/* Do not change airport if in the middle of another airport's state machine,
* as this can result in the airport being left in a blocked state */
AircraftNextAirportPos_and_Order(v); AircraftNextAirportPos_and_Order(v);
}
} else { } else {
v->current_order.MakeGoToDepot(destination, ODTFB_BREAKDOWN); v->current_order.MakeGoToDepot(destination, ODTFB_BREAKDOWN);
} }
} else { } else {
if (v->state != FLYING && v->targetairport != INVALID_STATION) {
/* Crashing whilst in an airport state machine is inconvenient
* as any blocks would need to then be marked unoccupied.
* Change the breakdown type to a speed reduction. */
v->breakdown_type = BREAKDOWN_AIRCRAFT_SPEED;
v->breakdown_severity = 15; /* very slow */
return;
}
/* If no hangar was found, crash */ /* If no hangar was found, crash */
v->targetairport = INVALID_STATION; v->targetairport = INVALID_STATION;
CrashAirplane(v); CrashAirplane(v);