diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -916,7 +916,6 @@ static byte GetAircraftFlyingAltitude(co
 static bool AircraftController(Vehicle *v)
 {
 	Station *st;
-	const AirportMovingData *amd;
 	Vehicle *u;
 	byte z, maxz, curz;
 	Direction newdir;
@@ -937,7 +936,7 @@ static bool AircraftController(Vehicle *
 	}
 
 	// get airport moving data
-	amd = GetAirportMovingData(st->airport_type, v->u.air.pos);
+	const AirportMovingData *amd = GetAirport(st->airport_type)->MovingData(v->u.air.pos);
 
 	// Helicopter raise
 	if (amd->flag & AMED_HELI_RAISE) {