Changeset - r14104:d7c66cb86325
[Not reviewed]
master
0 1 0
yexo - 15 years ago 2009-12-29 23:23:16
yexo@openttd.org
(svn r18661) -Fix [FS#3169]: aircraft on the metropolitan airport took a long route to the closest loading pad
1 file changed with 4 insertions and 2 deletions:
0 comments (0 inline, 0 general)
src/airport_movement.h
Show inline comments
 
@@ -134,13 +134,13 @@ static const AirportMovingData _airport_
 
	AMD(  300,  -48, AMED_NOSPDCLAMP | AMED_SLOWTURN, DIR_N ), // 27 Initial approach fix (south)
 
	AMD(  140,  -48, AMED_NOSPDCLAMP | AMED_SLOWTURN, DIR_N ), // 28 Intermediadate Approach fix (south), IAF (west)
 
	AMD(  -32,  120, AMED_NOSPDCLAMP | AMED_SLOWTURN, DIR_N ), // 29 Initial approach fix (east)
 
};
 

	
 
/* Metropolitan Airport (metropolitan) - 2 runways */
 
static const AirportMovingData _airport_moving_data_metropolitan[27] = {
 
static const AirportMovingData _airport_moving_data_metropolitan[28] = {
 
	AMD(   85,    3, AMED_EXACTPOS,                   DIR_SE), // 00 In Hangar
 
	AMD(   85,   22, 0,                               DIR_N ), // 01 Taxi to right outside depot
 
	AMD(   26,   41, AMED_EXACTPOS,                   DIR_SW), // 02 Terminal 1
 
	AMD(   56,   22, AMED_EXACTPOS,                   DIR_SE), // 03 Terminal 2
 
	AMD(   38,    8, AMED_EXACTPOS,                   DIR_SW), // 04 Terminal 3
 
	AMD(   65,    6, 0,                               DIR_N ), // 05 Taxi to right in infront of terminal 2/3
 
@@ -162,12 +162,13 @@ static const AirportMovingData _airport_
 
	AMD(  257,    1, AMED_NOSPDCLAMP | AMED_SLOWTURN, DIR_N ), // 21 Fly around waiting for a landing spot (south-west)
 
	AMD(  273,   49, AMED_NOSPDCLAMP | AMED_SLOWTURN, DIR_N ), // 22 Fly around waiting for a landing spot (south)
 
	AMD(   44,   58, 0,                               DIR_N ), // 23 Helicopter takeoff spot on ground (to clear airport sooner)
 
	AMD(   44,   63, AMED_HELI_RAISE,                 DIR_N ), // 24 Helicopter takeoff
 
	AMD(   15,   54, AMED_NOSPDCLAMP | AMED_SLOWTURN, DIR_N ), // 25 Get in position above landing spot helicopter
 
	AMD(   15,   54, AMED_HELI_LOWER,                 DIR_N ), // 26 Helicopter landing
 
	AMD(   21,   58, AMED_EXACTPOS,                   DIR_SW), // 27 Transitions after landing to on-ground movement
 
};
 

	
 
/* International Airport (international) - 2 runways, 6 terminals, dedicated helipod */
 
static const AirportMovingData _airport_moving_data_international[51] = {
 
	AMD(    7,   55, AMED_EXACTPOS,                   DIR_SE), // 00 In Hangar 1
 
	AMD(  100,   21, AMED_EXACTPOS,                   DIR_SE), // 01 In Hangar 2
 
@@ -551,23 +552,24 @@ static const AirportFTAbuildup _airport_
 
	/* landing */
 
	{ 13, FLYING, NOTHING_block, 19 }, { 13, LANDING, 0, 14 }, { 13, HELILANDING, 0, 25 },
 
	{ 14, LANDING, RUNWAY_IN_block, 15 },
 
	{ 15, 0, RUNWAY_IN_block, 16 },
 
	{ 16, 255, RUNWAY_IN_block, 0 }, { 16, ENDLANDING, IN_WAY_block, 17 },
 
	{ 17, 255, RUNWAY_OUT_block, 0 }, { 17, ENDLANDING, IN_WAY_block, 18 },
 
	{ 18, ENDLANDING, IN_WAY_block, 7 },
 
	{ 18, ENDLANDING, IN_WAY_block, 27 },
 
	/* In Air */
 
	{ 19, 0, NOTHING_block, 20 },
 
	{ 20, 0, NOTHING_block, 21 },
 
	{ 21, 0, NOTHING_block, 22 },
 
	{ 22, 0, NOTHING_block, 13 },
 
	/* helicopter */
 
	{ 23, 0, NOTHING_block, 24 },
 
	{ 24, HELITAKEOFF, NOTHING_block, 0 },
 
	{ 25, HELILANDING, IN_WAY_block, 26 },
 
	{ 26, HELIENDLANDING, IN_WAY_block, 18 },
 
	{ 27, 255, TAXIWAY_BUSY_block, 27 }, { 27, TERM1, TERM1_block, 2 }, { 27, 0, 0, 7 },
 
	{ MAX_ELEMENTS, 0, 0, 0 } // end marker. DO NOT REMOVE
 
};
 

	
 
static const TileIndexDiffC _airport_depots_international[] = { { 0, 3 }, { 6, 1 } };
 
static const byte _airport_terminal_international[] = { 2, 3, 3 };
 
static const byte _airport_helipad_international[] = { 1, 2 };
0 comments (0 inline, 0 general)