From 1e416f90fa4b44c379f53847b5d0a2d0ecebc055 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 8 Dec 2009 00:15:15 +0000 Subject: [PATCH] (svn r18428) -Fix: if lots of road vehicles are leaving a depot and the first in the hash linked list is basically the last of the vehicles to leave the depot then due to the 'jam prevention' code all vehicles would fairly quickly increase the blocked counter and drive off all simultaniously --- src/roadveh_cmd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index 243d711e45..50de1073ff 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -680,7 +680,7 @@ static Vehicle *EnumCheckRoadVehClose(Vehicle *v, void *data) return NULL; } -static RoadVehicle *RoadVehFindCloseTo(RoadVehicle *v, int x, int y, Direction dir) +static RoadVehicle *RoadVehFindCloseTo(RoadVehicle *v, int x, int y, Direction dir, bool update_blocked_ctr = true) { RoadVehFindData rvf; RoadVehicle *front = v->First(); @@ -709,7 +709,7 @@ static RoadVehicle *RoadVehFindCloseTo(RoadVehicle *v, int x, int y, Direction d return NULL; } - if (++front->blocked_ctr > 1480) return NULL; + if (update_blocked_ctr && ++front->blocked_ctr > 1480) return NULL; return RoadVehicle::From(rvf.best); } @@ -1047,7 +1047,7 @@ static bool RoadVehLeaveDepot(RoadVehicle *v, bool first) int y = TileY(v->tile) * TILE_SIZE + (rdp[RVC_DEPOT_START_FRAME].y & 0xF); if (first) { - if (RoadVehFindCloseTo(v, x, y, v->direction) != NULL) return true; + if (RoadVehFindCloseTo(v, x, y, v->direction, false) != NULL) return true; VehicleServiceInDepot(v);