mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

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

release/0.4.5
peter1138 2005-11-03 18:27:29 +00:00
parent 7c40462d24
commit 01b6109751
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engine.c
View File

@ -718,12 +718,6 @@ static void DoTriggerVehicle(Vehicle *veh, VehicleTrigger trigger, byte base_ran
(resolve_callback) TriggerVehicleSpriteGroup); (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) if (group == NULL)
return; return;
@ -773,6 +767,11 @@ static void DoTriggerVehicle(Vehicle *veh, VehicleTrigger trigger, byte base_ran
void TriggerVehicle(Vehicle *veh, VehicleTrigger trigger) 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); DoTriggerVehicle(veh, trigger, 0, true);
} }