(svn r3126) Autoreplace: Only the first vehicle in a chain should be marked as entering a depot, so call moved out of DoVehicleTrigger loop.

1 files changed, 5 insertions, 6 deletions

diff --git a/engine.c b/engine.c
index df0a16308..2ce2a21a7 100644
--- a/engine.c
+++ b/engine.c
@@ -718,12 +718,6 @@ static void DoTriggerVehicle(Vehicle *veh, VehicleTrigger trigger, byte base_ran
 		                                  (resolve_callback) TriggerVehicleSpriteGroup);
 	}
 
-	if (trigger == VEHICLE_TRIGGER_DEPOT) {
-		// store that the vehicle entered a depot this tick
-		// it needs to be before all possible return statements;
-		VehicleEnteredDepotThisTick(veh);
-	}
-
 	if (group == NULL)
 		return;
 
@@ -773,6 +767,11 @@ static void DoTriggerVehicle(Vehicle *veh, VehicleTrigger trigger, byte base_ran
 
 void TriggerVehicle(Vehicle *veh, VehicleTrigger trigger)
 {
+	if (trigger == VEHICLE_TRIGGER_DEPOT) {
+		// store that the vehicle entered a depot this tick
+		VehicleEnteredDepotThisTick(veh);
+	}
+
 	DoTriggerVehicle(veh, trigger, 0, true);
 }