(svn r9819) -Codechange: Take account of AMED_HOLD in OTTD/TTDP state translation (bulb)
authorpeter1138
Thu, 10 May 2007 09:21:22 +0000
changeset 6604 3ee954a2c95e
parent 6603 076b05312635
child 6605 d92f454a00a6
(svn r9819) -Codechange: Take account of AMED_HOLD in OTTD/TTDP state translation (bulb)
src/newgrf_engine.cpp
--- a/src/newgrf_engine.cpp	Thu May 10 06:42:43 2007 +0000
+++ b/src/newgrf_engine.cpp	Thu May 10 09:21:22 2007 +0000
@@ -246,7 +246,7 @@
 {
 	const Station *st = GetStation(v->u.air.targetairport);
 	const AirportFTAClass *afc = st->Airport();
-	byte amdflag = afc->MovingData(v->u.air.pos)->flag;
+	uint16 amdflag = afc->MovingData(v->u.air.pos)->flag;
 
 	switch (v->u.air.state) {
 		case HANGAR:
@@ -313,7 +313,7 @@
 			}
 
 		case FLYING:
-			return AMS_TTDP_FLIGHT_TO_TOWER;
+			return amdflag & AMED_HOLD ? AMS_TTDP_FLIGHT_APPROACH : AMS_TTDP_FLIGHT_TO_TOWER;
 
 		case LANDING: // Descent
 			return AMS_TTDP_FLIGHT_DESCENT;