From 682b9ee8e4e594b4737528ff769bbe526aee2f8e Mon Sep 17 00:00:00 2001 From: bjarni Date: Mon, 31 Oct 2005 12:59:47 +0000 Subject: (svn r3111) -Fix: [autoreplace] [ 1341783 ] Assertion failure in vehicle.c line 378 running MaybeReplaceVehicle() is now delayed until after the loop in CallVehicleTicks() This avoids selling the vehicle the loop currently works with (and continues to work with afterwards) --- engine.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'engine.c') diff --git a/engine.c b/engine.c index acb4df082..df0a16308 100644 --- a/engine.c +++ b/engine.c @@ -718,6 +718,12 @@ 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; -- cgit v1.2.3-54-g00ecf