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

Fix implicit order generation with road vehicle leave stop next order check

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-02-16 01:35:06 +00:00
parent ae3c4f2d6d
commit 20c5d471be
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/roadveh_cmd.cpp
View File

@@ -1570,20 +1570,27 @@ static bool CheckRestartLoadingAtRoadStop(RoadVehicle *v)
StationID station_id = v->current_order.GetDestination(); StationID station_id = v->current_order.GetDestination();
VehicleOrderID next_order_idx = AdvanceOrderIndexDeferred(v, v->cur_implicit_order_index); VehicleOrderID next_order_idx = AdvanceOrderIndexDeferred(v, v->cur_implicit_order_index);
const Order *next_order = v->GetOrder(next_order_idx); const Order *next_order = v->GetOrder(next_order_idx);
FlushAdvanceOrderIndexDeferred(v, false);
if (next_order != nullptr && next_order->IsType(OT_GOTO_STATION) && next_order->GetDestination() == station_id && if (next_order != nullptr && next_order->IsType(OT_GOTO_STATION) && next_order->GetDestination() == station_id &&
!(next_order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) && !(next_order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) &&
IsInfraTileUsageAllowed(VEH_ROAD, v->owner, v->tile) && IsInfraTileUsageAllowed(VEH_ROAD, v->owner, v->tile) &&
GetRoadStopType(v->tile) == (v->IsBus() ? ROADSTOP_BUS : ROADSTOP_TRUCK)) { GetRoadStopType(v->tile) == (v->IsBus() ? ROADSTOP_BUS : ROADSTOP_TRUCK)) {
FlushAdvanceOrderIndexDeferred(v, true);
v->current_order.Free(); v->current_order.Free();
v->cur_implicit_order_index = next_order_idx;
ProcessOrders(v); ProcessOrders(v);
/* Double check that order prediction was correct and v->current_order is now for the same station */
if (v->current_order.IsType(OT_GOTO_STATION) && v->current_order.GetDestination() == station_id &&
!(v->current_order.GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION)) {
v->last_station_visited = station_id; v->last_station_visited = station_id;
v->BeginLoading(); v->BeginLoading();
return true; return true;
} else {
/* Order prediction was incorrect, this should not be reached, just restore the leave station order */
v->current_order.MakeLeaveStation();
v->current_order.SetDestination(station_id);
}
} }
FlushAdvanceOrderIndexDeferred(v, false);
return false; return false;
} }