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

Fix ProcessOrders not always being called after leaving a waiting order

Browse Source 
Fixes conditional order loop on leaving a depot
This commit is contained in:
Jonathan G Rennison
2021-08-30 15:26:49 +01:00
parent 58a290d8e9
commit f8e30e807d
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/train_cmd.cpp
View File

@@ -3208,7 +3208,7 @@ static bool CheckTrainStayInDepot(Train *v)
}
if (v->current_order.IsWaitTimetabled()) {
v->HandleWaiting(false);
v->HandleWaiting(false, true);
}
if (v->current_order.IsType(OT_WAITING)) {
return true;
@@ -6198,9 +6198,8 @@ static bool TrainLocoHandler(Train *v, bool mode)
if (CheckTrainStayInDepot(v)) return true;
if (v->current_order.IsType(OT_WAITING) && v->reverse_distance == 0) {
v->HandleWaiting(false);
v->HandleWaiting(false, true);
if (v->current_order.IsType(OT_WAITING)) return true;
ProcessOrders(v);
if (IsRailWaypointTile(v->tile)) {
StationID station_id = GetStationIndex(v->tile);
if (v->current_order.ShouldStopAtStation(v, station_id, true)) {