dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If aircraft next order is for same station when leaving, do not leave

Browse Source 
Just start loading again without moving instead
This commit is contained in:
Jonathan G Rennison
2022-02-15 20:24:13 +00:00
parent 323810b4e1
commit 5119d61c82
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/aircraft_cmd.cpp
View File

@@ -2190,7 +2190,23 @@ static bool AircraftEventHandler(Aircraft *v, int loop)
ProcessOrders(v); ProcessOrders(v);
v->HandleLoading(loop != 0); v->HandleLoading(loop != 0);
if (v->current_order.IsType(OT_LOADING) || v->current_order.IsType(OT_LEAVESTATION)) return true; if (v->current_order.IsType(OT_LOADING)) return true;
if (v->current_order.IsType(OT_LEAVESTATION)) {
StationID station_id = v->current_order.GetDestination();
v->current_order.Free();
ProcessOrders(v);
if (v->current_order.IsType(OT_GOTO_STATION) && v->current_order.GetDestination() == station_id &&
v->targetairport == station_id && IsAirportTile(v->tile) && GetStationIndex(v->tile) == station_id) {
AircraftEntersTerminal(v);
return true;
}
v->PlayLeaveStationSound();
return true;
}
if (v->state >= ENDTAKEOFF && v->state <= HELIENDLANDING) { if (v->state >= ENDTAKEOFF && v->state <= HELIENDLANDING) {
/* If we are flying, unconditionally clear the 'dest too far' state. */ /* If we are flying, unconditionally clear the 'dest too far' state. */

2
src/vehicle.cpp
View File

@@ -3538,7 +3538,7 @@ void Vehicle::HandleLoading(bool mode)
return; return;
} }
if (this->type != VEH_TRAIN && this->type != VEH_SHIP) this->PlayLeaveStationSound(); if (this->type != VEH_TRAIN && this->type != VEH_SHIP && this->type != VEH_AIRCRAFT) this->PlayLeaveStationSound();
this->LeaveStation(); this->LeaveStation();