From 6babc602542ebb2b6fb43fd2f2f46cc7ed4c2236 Mon Sep 17 00:00:00 2001 From: yexo Date: Thu, 12 Aug 2010 22:36:42 +0000 Subject: (svn r20476) -Codechange: simplify a check in aircraft_cmd.cpp by using the existing CanVehicleUseStation --- src/aircraft_cmd.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index b778dc620..6664cef72 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -1529,9 +1529,7 @@ static void AircraftEventHandler_Flying(Aircraft *v, const AirportFTAClass *apc) Station *st = Station::Get(v->targetairport); /* runway busy or not allowed to use this airstation, circle */ - if ((apc->flags & (v->subtype == AIR_HELICOPTER ? AirportFTAClass::HELICOPTERS : AirportFTAClass::AIRPLANES)) && - st->airport.tile != INVALID_TILE && - (st->owner == OWNER_NONE || st->owner == v->owner)) { + if (CanVehicleUseStation(v, st) && (st->owner == OWNER_NONE || st->owner == v->owner)) { /* {32,FLYING,NOTHING_block,37}, {32,LANDING,N,33}, {32,HELILANDING,N,41}, * if it is an airplane, look for LANDING, for helicopter HELILANDING * it is possible to choose from multiple landing runways, so loop until a free one is found */ -- cgit v1.2.3-70-g09d2