(svn r3126) Autoreplace: Only the first vehicle in a chain should be marked as entering a depot, so call moved out of DoVehicleTrigger loop.
authorpeter1138
Thu, 03 Nov 2005 18:27:29 +0000
changeset 2589 28c7b9b212af
parent 2588 40d7dba79fc7
child 2590 5603f43c8cd3
(svn r3126) Autoreplace: Only the first vehicle in a chain should be marked as entering a depot, so call moved out of DoVehicleTrigger loop.
engine.c
--- a/engine.c	Thu Nov 03 15:25:45 2005 +0000
+++ b/engine.c	Thu Nov 03 18:27:29 2005 +0000
@@ -718,12 +718,6 @@
 		                                  (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 @@
 
 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);
 }