From cc52a56052a58e8566bbc04693c7ac8b66d033f1 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 13 Jan 2008 12:08:35 +0000 Subject: (svn r11830) -Fix [FS#1625]: road vehicles would not wait in line, but at a single point on bridges. Based on a patch by SmatZ. --- src/roadveh_cmd.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index 0dd9d955c..8cb3cb67f 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -895,6 +895,7 @@ static Vehicle* RoadVehFindCloseTo(Vehicle* v, int x, int y, Direction dir) rvf.veh = v; if (front->u.road.state == RVSB_WORMHOLE) { u = (Vehicle*)VehicleFromPos(v->tile, &rvf, EnumCheckRoadVehClose); + if (u == NULL) u = (Vehicle*)VehicleFromPos(GetOtherTunnelBridgeEnd(v->tile), &rvf, EnumCheckRoadVehClose); } else { u = (Vehicle*)VehicleFromPosXY(x, y, &rvf, EnumCheckRoadVehClose); } @@ -1511,10 +1512,12 @@ static bool IndividualRoadVehicleController(Vehicle *v, const Vehicle *prev) /* Vehicle is entering a depot or is on a bridge or in a tunnel */ GetNewVehiclePosResult gp = GetNewVehiclePos(v); - const Vehicle *u = RoadVehFindCloseTo(v, gp.x, gp.y, v->direction); - if (u != NULL && u->First()->cur_speed < v->cur_speed) { - v->cur_speed = u->First()->cur_speed; - return false; + if (IsRoadVehFront(v)) { + const Vehicle *u = RoadVehFindCloseTo(v, gp.x, gp.y, v->direction); + if (u != NULL) { + v->cur_speed = u->First()->cur_speed; + return false; + } } if ((IsTunnelTile(gp.new_tile) || IsBridgeTile(gp.new_tile)) && HasBit(VehicleEnterTile(v, gp.new_tile, gp.x, gp.y), VETS_ENTERED_WORMHOLE)) { -- cgit v1.2.3-54-g00ecf