(svn r1440) -Feature: Allows more flexible airport layouts now, as the number of

terminals in every group can be freely chosen
-Codechange: AT_OILRIG is now 15, so that new airports can be added
easily.

1 files changed, 17 insertions, 1 deletions

diff --git a/airport_movement.h b/airport_movement.h
index 652017e0a..fdc8c2292 100644
--- a/airport_movement.h
+++ b/airport_movement.h
@@ -264,6 +264,7 @@ static const AirportMovingData _airport_moving_data_oilrig[9] = {
 // first element of depots array tells us how many depots there are (to know size of array)
 // this may be changed later when airports are moved to external file
 static const TileIndexDiffC _airport_depots_country[] = {{3, 0}};
+static const byte _airport_terminal_country[] = {1, 2};
 static const AirportFTAbuildup _airport_fta_country[] = {
 	{ 0,HANGAR,NOTHING_block,1},
 	{ 1,255,AIRPORT_BUSY_block,0}, {1,HANGAR,0,0}, {1,TERM1,TERM1_block,2}, {1,TERM2,0,4}, {1,HELITAKEOFF,0,19}, {1,0,0,6},
@@ -294,6 +295,7 @@ static const AirportFTAbuildup _airport_fta_country[] = {
 };
 
 static const TileIndexDiffC _airport_depots_city[] = {{5, 0}};
+static const byte _airport_terminal_city[] = {1, 3};
 static const AirportFTAbuildup _airport_fta_city[] = {
 	{ 0,HANGAR,NOTHING_block,1}, {0,TAKEOFF,OUT_WAY_block,1}, {0,0,0,1},
 	{ 1,255,TAXIWAY_BUSY_block,0}, {1,HANGAR,0,0}, {1,TERM2,0,6}, {1,TERM3,0,6}, {1,0,0,7}, // for all else, go to 7
@@ -328,6 +330,7 @@ static const AirportFTAbuildup _airport_fta_city[] = {
 };
 
 static const TileIndexDiffC _airport_depots_metropolitan[] = {{5, 0}};
+static const byte _airport_terminal_metropolitan[] = {1, 3};
 static const AirportFTAbuildup _airport_fta_metropolitan[] = {
 	{ 0,HANGAR,NOTHING_block,1},
 	{ 1,255,TAXIWAY_BUSY_block,0}, {1,HANGAR,0,0}, {1,TERM2,0,6}, {1,TERM3,0,6}, {1,0,0,7}, // for all else, go to 7
@@ -364,6 +367,8 @@ static const AirportFTAbuildup _airport_fta_metropolitan[] = {
 };
 
 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};
 static const AirportFTAbuildup _airport_fta_international[] = {
 	{ 0,HANGAR,NOTHING_block,2}, {0,255,TERM_GROUP1_block,0}, {0,255,TERM_GROUP2_ENTER1_block,1}, {0,HELITAKEOFF,HELIPAD1_block,2}, {0,0,0,2},
 	{ 1,HANGAR,NOTHING_block,3}, {1,255,HANGAR2_AREA_block,1}, {1,HELITAKEOFF,HELIPAD2_block,3}, {1,0,0,3},
@@ -426,6 +431,7 @@ static const AirportFTAbuildup _airport_fta_international[] = {
 };
 
 // heliports, oilrigs don't have depots
+static const byte _airport_helipad_heliport_oilrig[] = {1, 1};
 static const AirportFTAbuildup _airport_fta_heliport_oilrig[] = {
 	{0,HELIPAD1,HELIPAD1_block,1},
 	{1,HELITAKEOFF,NOTHING_block,0}, // takeoff
@@ -440,12 +446,22 @@ static const AirportFTAbuildup _airport_fta_heliport_oilrig[] = {
 	{MAX_ELEMENTS,0,0,0} // end marker. DO NOT REMOVE
 };
 
-static const AirportMovingData * const _airport_moving_datas[6] = {
+static const AirportMovingData * const _airport_moving_datas[] = {
 	_airport_moving_data_country,				// Country Airfield (small) 4x3
 	_airport_moving_data_town,					// City Airport (large) 6x6
 	_airport_moving_data_heliport,			// Heliport
 	_airport_moving_data_metropolitan,	// Metropolitain Airport (large) - 2 runways
 	_airport_moving_data_international,	// International Airport (xlarge) - 2 runways
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
 	_airport_moving_data_oilrig					// Oilrig
 };