From 6abbf15a8ef1f380ad820d40d69fb7c8f52e0f58 Mon Sep 17 00:00:00 2001 From: celestar Date: Thu, 15 Feb 2007 10:21:00 +0000 Subject: [PATCH] (svn r8744) -Fix(r654/2105): Call GetFirstVehicleInChain only for trains, and assert the vehicle type in that function. Not a critical error, but it does increase game performance by up to 10% when playing a large game (many vehicles) with aircraft/road vehicle newgrfs loaded. --- src/newgrf_engine.cpp | 2 +- src/vehicle.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp index d052d16bb4..3bf9a93a45 100644 --- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -1010,7 +1010,7 @@ static void DoTriggerVehicle(Vehicle *v, VehicleTrigger trigger, byte base_rando * i.e.), so we give them all the NEW_CARGO triggered * vehicle's portion of random bits. */ assert(first); - DoTriggerVehicle(GetFirstVehicleInChain(v), VEHICLE_TRIGGER_ANY_NEW_CARGO, new_random_bits, false); + DoTriggerVehicle((v->type == VEH_Train) ? GetFirstVehicleInChain(v) : v, VEHICLE_TRIGGER_ANY_NEW_CARGO, new_random_bits, false); break; case VEHICLE_TRIGGER_DEPOT: diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 5197e6fc45..f76a49b965 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -515,6 +515,7 @@ Vehicle *GetFirstVehicleInChain(const Vehicle *v) Vehicle* u; assert(v != NULL); + assert(v->type == VEH_Train); if (v->first != NULL) { if (IsFrontEngine(v->first) || IsFreeWagon(v->first)) return v->first;