From 723321ecac4f19cdfb2c872fafe2a71e4c91a8f7 Mon Sep 17 00:00:00 2001 From: Michael Lutz Date: Thu, 1 Jan 2015 23:01:08 +0100 Subject: -Fix [FS#6176]: RV overtaking ignored timetabled maximum speeds. --- src/roadveh_cmd.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index 3f9d361..7404f19 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -806,12 +806,6 @@ static void RoadVehCheckOvertake(RoadVehicle *v, RoadVehicle *u) od.v = v; od.u = u; - if (u->vcache.cached_max_speed >= v->vcache.cached_max_speed && - !(u->vehstatus & VS_STOPPED) && - u->cur_speed != 0) { - return; - } - /* Trams can't overtake other trams */ if (v->roadtype == ROADTYPE_TRAM) return; @@ -827,6 +821,15 @@ static void RoadVehCheckOvertake(RoadVehicle *v, RoadVehicle *u) /* Check if vehicle is in a road stop, depot, tunnel or bridge or not on a straight road */ if (v->state >= RVSB_IN_ROAD_STOP || !IsStraightRoadTrackdir((Trackdir)(v->state & RVSB_TRACKDIR_MASK))) return; + /* Can't overtake a vehicle that is moving faster than us. If the vehicle in front is + * accelerating, take the maximum speed for the comparison, else the current speed. */ + int u_speed = u->GetAcceleration() > 0 ? u->GetCurrentMaxSpeed() : u->cur_speed; + if (u_speed >= v->GetCurrentMaxSpeed() && + !(u->vehstatus & VS_STOPPED) && + u->cur_speed != 0) { + return; + } + od.trackdir = DiagDirToDiagTrackdir(DirToDiagDir(v->direction)); /* Are the current and the next tile suitable for overtaking? -- 2.1.1