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

Override remain at station behaviour for road vehicles with explicit stop direction set

Browse Source 
(cherry picked from commit 8f8d635baf3dc1506de206a3378498bedfd020bf)

See: #686
This commit is contained in:
Calvin Sykes
2024-04-19 18:01:49 +01:00
committed by Jonathan G Rennison
parent 247b40c95b
commit 69cb68a3e2
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/roadveh_cmd.cpp
View File

@@ -1609,6 +1609,7 @@ static bool CheckRestartLoadingAtRoadStop(RoadVehicle *v)
const Order *next_order = v->GetOrder(next_order_idx); const Order *next_order = v->GetOrder(next_order_idx);
FlushAdvanceOrderIndexDeferred(v, false); 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->GetRoadVehTravelDirection() == INVALID_DIAGDIR || next_order->GetRoadVehTravelDirection() == DirToDiagDir(v->direction)) &&
!(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)) {