From 2ce3d10584c44d03f8c5d17f04160e1254259c4f Mon Sep 17 00:00:00 2001 From: SamuXarick <43006711+SamuXarick@users.noreply.github.com> Date: Thu, 28 Dec 2023 15:21:16 +0000 Subject: [PATCH] Codechange: Iterate aircraft group list for UpdateAirplanesOnNewStation --- src/aircraft_cmd.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index 1f5f986282..45c7e47537 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -2144,8 +2144,10 @@ void UpdateAirplanesOnNewStation(const Station *st) const AirportFTAClass *ap = st->airport.GetFTA(); Direction rotation = st->airport.tile == INVALID_TILE ? DIR_N : st->airport.rotation; - for (Aircraft *v : Aircraft::Iterate()) { - if (!v->IsNormalAircraft() || v->targetairport != st->index) continue; + const VehicleList &vehicle_list = Company::Get(st->owner)->group_all[VEH_AIRCRAFT].vehicle_list; + for (const Vehicle *vehicle : vehicle_list) { + Aircraft *v = Aircraft::From(Vehicle::Get(vehicle->index)); + if (v->targetairport != st->index) continue; assert(v->state == FLYING); Order *o = &v->current_order;