(svn r8747) -Fix

-Codechange: Make the encoding of accepted aircraft types of airports a bit more sensible and move the enum into struct AirportFTAClass

src/airport.cpp

@@ -37,7 +37,7 @@ void InitializeAirports(void)
 		_airport_terminal_country,
 		NULL,
 		16,
-		ALL,
+		AirportFTAClass::ALL,
 		_airport_fta_country,
 		_airport_depots_country,
 		lengthof(_airport_depots_country),
@@ -50,7 +50,7 @@ void InitializeAirports(void)
 		_airport_terminal_city,
 		NULL,
 		19,
-		ALL,
+		AirportFTAClass::ALL,
 		_airport_fta_city,
 		_airport_depots_city,
 		lengthof(_airport_depots_city),
@@ -63,7 +63,7 @@ void InitializeAirports(void)
 		_airport_terminal_metropolitan,
 		NULL,
 		20,
-		ALL,
+		AirportFTAClass::ALL,
 		_airport_fta_metropolitan,
 		_airport_depots_metropolitan,
 		lengthof(_airport_depots_metropolitan),
@@ -76,7 +76,7 @@ void InitializeAirports(void)
 		_airport_terminal_international,
 		_airport_helipad_international,
 		37,
-		ALL,
+		AirportFTAClass::ALL,
 		_airport_fta_international,
 		_airport_depots_international,
 		lengthof(_airport_depots_international),
@@ -89,7 +89,7 @@ void InitializeAirports(void)
 		_airport_terminal_intercontinental,
 		_airport_helipad_intercontinental,
 		43,
-		ALL,
+		AirportFTAClass::ALL,
 		_airport_fta_intercontinental,
 		_airport_depots_intercontinental,
 		lengthof(_airport_depots_intercontinental),
@@ -102,7 +102,7 @@ void InitializeAirports(void)
 		NULL,
 		_airport_helipad_heliport_oilrig,
 		7,
-		HELICOPTERS_ONLY,
+		AirportFTAClass::HELICOPTERS,
 		_airport_fta_heliport_oilrig,
 		NULL,
 		0,
@@ -115,7 +115,7 @@ void InitializeAirports(void)
 		NULL,
 		_airport_helipad_heliport_oilrig,
 		7,
-		HELICOPTERS_ONLY,
+		AirportFTAClass::HELICOPTERS,
 		_airport_fta_heliport_oilrig,
 		NULL,
 		0,
@@ -128,7 +128,7 @@ void InitializeAirports(void)
 		_airport_terminal_commuter,
 		_airport_helipad_commuter,
 		22,
-		ALL,
+		AirportFTAClass::ALL,
 		_airport_fta_commuter,
 		_airport_depots_commuter,
 		lengthof(_airport_depots_commuter),
@@ -141,7 +141,7 @@ void InitializeAirports(void)
 		NULL,
 		_airport_helipad_helidepot,
 		4,
-		HELICOPTERS_ONLY,
+		AirportFTAClass::HELICOPTERS,
 		_airport_fta_helidepot,
 		_airport_depots_helidepot,
 		lengthof(_airport_depots_helidepot),
@@ -154,7 +154,7 @@ void InitializeAirports(void)
 		NULL,
 		_airport_helipad_helistation,
 		25,
-		HELICOPTERS_ONLY,
+		AirportFTAClass::HELICOPTERS,
 		_airport_fta_helistation,
 		_airport_depots_helistation,
 		lengthof(_airport_depots_helistation),
@@ -192,7 +192,7 @@ AirportFTAClass::AirportFTAClass(
 	const byte *terminals_,
 	const byte *helipads_,
 	const byte entry_point_,
-	const AcceptPlanes acc_planes_,
+	Flags flags_,
 	const AirportFTAbuildup *apFA,
 	const TileIndexDiffC *depots_,
 	const byte nof_depots_,
@@ -204,6 +204,7 @@ AirportFTAClass::AirportFTAClass(
 	terminals(terminals_),
 	helipads(helipads_),
 	airport_depots(depots_),
+	flags(flags_),
 	nof_depots(nof_depots_),
 	nofelements(AirportGetNofElements(apFA)),
 	entry_point(entry_point_),
@@ -213,8 +214,6 @@ AirportFTAClass::AirportFTAClass(
 {
 	byte nofterminalgroups, nofhelipadgroups;
 
-	acc_planes = acc_planes_; // XXX TinyEnumT has no initialisation, only assignment
-
 	/* Set up the terminal and helipad count for an airport.
 	 * TODO: If there are more than 10 terminals or 4 helipads, internal variables
 	 * need to be changed, so don't allow that for now */