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

Fix handling of road-stop states in a6ea1ea40

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-04-27 18:04:43 +01:00
parent a6ea1ea408
commit 2ff8a71e59
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/roadveh_cmd.cpp
View File

@@ -1210,7 +1210,7 @@ bool IndividualRoadVehicleController(RoadVehicle *v, const RoadVehicle *prev)
if (IsTileType(v->tile, MP_STATION)) { if (IsTileType(v->tile, MP_STATION)) {
/* Force us to be not overtaking! */ /* Force us to be not overtaking! */
v->SetRoadVehicleOvertaking(0); v->SetRoadVehicleOvertaking(0);
} else if (v->HasArticulatedPart() && !IsStraightRoadTrackdir((Trackdir)v->state)) { } else if (v->HasArticulatedPart() && (v->state >= RVSB_IN_ROAD_STOP || !IsStraightRoadTrackdir((Trackdir)v->state))) {
/* Articulated RVs may not overtake on corners */ /* Articulated RVs may not overtake on corners */
v->SetRoadVehicleOvertaking(0); v->SetRoadVehicleOvertaking(0);
} else if (++v->overtaking_ctr >= RV_OVERTAKE_TIMEOUT) { } else if (++v->overtaking_ctr >= RV_OVERTAKE_TIMEOUT) {