Redo the runway database scheme to use a flat/ascii file and load the entire

[flightgear.git] / src / Main / globals.hxx

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 38fb0f4c55eeb2edc96c5c7cafc0885a21ec31d6..827debbcabcdc841c9405a7d6aa9c9eb5b242b78 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -59,14 +59,14 @@ class SGRoute;
 class SGTime;
 class SGSoundMgr;
 
+class FGAirportList;
+class FGRunwayList;
 class FGAIMgr;
 class FGATCMgr;
 class FGATCDisplay;
 class FGAircraftModel;
 class FGAutopilot;
 class FGControls;
-class FGEnvironment;
-class FGEnvironmentMgr;
 class FGIO;
 class FGModelMgr;
 class FGScenery;
@@ -136,8 +136,11 @@ private:
     // sound manager
     SGSoundMgr *soundmgr;
 
-    // environment information
-    FGEnvironmentMgr * environment_mgr;
+    // Simple Airport List
+    FGAirportList *airports;
+
+    // Runway List
+    FGRunwayList *runways;
 
     // ATC manager
     FGATCMgr *ATC_mgr;
@@ -245,12 +248,11 @@ public:
     inline SGRoute *get_route() const { return route; }
     inline void set_route( SGRoute *r ) { route = r; }
 
-    inline FGEnvironmentMgr * get_environment_mgr() {
-      return environment_mgr;
-    }
-    inline void set_environment_mgr(FGEnvironmentMgr * mgr) {
-      environment_mgr = mgr;
-    }
+    inline FGAirportList *get_airports() const { return airports; }
+    inline void set_airports( FGAirportList *a ) {airports = a; }
+
+    inline FGRunwayList *get_runways() const { return runways; }
+    inline void set_runways( FGRunwayList *r ) {runways = r; }
 
     inline FGATCMgr *get_ATC_mgr() const { return ATC_mgr; }
     inline void set_ATC_mgr( FGATCMgr *a ) {ATC_mgr = a; }