(svn r22309) -Fix: Make road vehicles, ships and aircraft skip orders if they are leaving a depot and heading to the same one again; just like trains since r16322.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index 69c1a555d..5ef0946c5 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -941,6 +941,12 @@ static bool RoadVehLeaveDepot(RoadVehicle *v, bool first)
 	int y = TileY(v->tile) * TILE_SIZE + (rdp[RVC_DEPOT_START_FRAME].y & 0xF);
 
 	if (first) {
+		/* We are leaving a depot, but have to go to the exact same one; re-enter */
+		if (v->current_order.IsType(OT_GOTO_DEPOT) && v->tile == v->dest_tile) {
+			VehicleEnterDepot(v);
+			return true;
+		}
+
 		if (RoadVehFindCloseTo(v, x, y, v->direction, false) != NULL) return true;
 
 		VehicleServiceInDepot(v);