Mercurial > hg > openttd
changeset 15801:62a5cd800e6a draft
(svn r20476) -Codechange: simplify a check in aircraft_cmd.cpp by using the existing CanVehicleUseStation
| author | yexo <yexo@openttd.org> |
|---|---|
| date | Thu, 12 Aug 2010 22:36:42 +0000 |
| parents | ab2c348269ea |
| children | c0e7e98fe4b7 |
| files | src/aircraft_cmd.cpp |
| diffstat | 1 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -1529,9 +1529,7 @@ 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 */