--- a/src/airport.h Tue Mar 27 20:12:11 2007 +0000
+++ b/src/airport.h Tue Mar 27 21:11:34 2007 +0000
@@ -7,10 +7,10 @@
#include "direction.h"
-enum {MAX_TERMINALS = 10};
+enum {MAX_TERMINALS = 12};
enum {MAX_HELIPADS = 4};
enum {MAX_ELEMENTS = 255};
-enum {MAX_HEADINGS = 22};
+enum {MAX_HEADINGS = 30};
// Airport types
enum {
@@ -23,95 +23,14 @@
AT_HELIDEPOT = 6,
AT_INTERCON = 7,
AT_HELISTATION = 8,
+ AT_LGA = 9,
+ AT_MUC = 10,
+ AT_SFO = 11,
+ AT_AMS = 12,
AT_OILRIG = 15
};
-enum {
- AMED_NOSPDCLAMP = 1 << 0,
- AMED_TAKEOFF = 1 << 1,
- AMED_SLOWTURN = 1 << 2,
- AMED_LAND = 1 << 3,
- AMED_EXACTPOS = 1 << 4,
- AMED_BRAKE = 1 << 5,
- AMED_HELI_RAISE = 1 << 6,
- AMED_HELI_LOWER = 1 << 7,
- AMED_HOLD = 1 << 8
-};
-
-/* Movement States on Airports (headings target) */
-enum {
- TO_ALL = 0,
- HANGAR = 1,
- TERM1 = 2,
- TERM2 = 3,
- TERM3 = 4,
- TERM4 = 5,
- TERM5 = 6,
- TERM6 = 7,
- HELIPAD1 = 8,
- HELIPAD2 = 9,
- TAKEOFF = 10,
- STARTTAKEOFF = 11,
- ENDTAKEOFF = 12,
- HELITAKEOFF = 13,
- FLYING = 14,
- LANDING = 15,
- ENDLANDING = 16,
- HELILANDING = 17,
- HELIENDLANDING = 18,
- TERM7 = 19,
- TERM8 = 20,
- HELIPAD3 = 21,
- HELIPAD4 = 22
-};
-
-/* Movement Blocks on Airports */
-// blocks (eg_airport_flags)
-static const uint64
- TERM1_block = 1 << 0,
- TERM2_block = 1 << 1,
- TERM3_block = 1 << 2,
- TERM4_block = 1 << 3,
- TERM5_block = 1 << 4,
- TERM6_block = 1 << 5,
- HELIPAD1_block = 1 << 6,
- HELIPAD2_block = 1 << 7,
- RUNWAY_IN_OUT_block = 1 << 8,
- RUNWAY_IN_block = 1 << 8,
- AIRPORT_BUSY_block = 1 << 8,
- RUNWAY_OUT_block = 1 << 9,
- TAXIWAY_BUSY_block = 1 << 10,
- OUT_WAY_block = 1 << 11,
- IN_WAY_block = 1 << 12,
- AIRPORT_ENTRANCE_block = 1 << 13,
- TERM_GROUP1_block = 1 << 14,
- TERM_GROUP2_block = 1 << 15,
- HANGAR2_AREA_block = 1 << 16,
- TERM_GROUP2_ENTER1_block = 1 << 17,
- TERM_GROUP2_ENTER2_block = 1 << 18,
- TERM_GROUP2_EXIT1_block = 1 << 19,
- TERM_GROUP2_EXIT2_block = 1 << 20,
- PRE_HELIPAD_block = 1 << 21,
-
-// blocks for new airports
- TERM7_block = 1 << 22,
- TERM8_block = 1 << 23,
- TERM9_block = 1 << 24,
- HELIPAD3_block = 1 << 24,
- TERM10_block = 1 << 25,
- HELIPAD4_block = 1 << 25,
- HANGAR1_AREA_block = 1 << 26,
- OUT_WAY2_block = 1 << 27,
- IN_WAY2_block = 1 << 28,
- RUNWAY_IN2_block = 1 << 29,
- RUNWAY_OUT2_block = 1 << 10, // note re-uses TAXIWAY_BUSY
- HELIPAD_GROUP_block = 1 << 13, // note re-uses AIRPORT_ENTRANCE
- OUT_WAY_block2 = 1 << 31,
-// end of new blocks
-
- NOTHING_block = 1 << 30;
-
struct AirportMovingData {
int16 x;
int16 y;