cosmetic changes *only*:

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index cc8f280fb72fb1a7778161caa9fa08263046e6b2..9182326ee245bd0f01545bdb33ae3af4e139a137 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -57,7 +57,6 @@ class SGEphemeris;
 class SGCommandMgr;
 class SGMagVar;
 class SGMaterialLib;
-class SGModelLib;
 class SGPropertyNode;
 class SGTime;
 class SGSoundMgr;
@@ -67,12 +66,12 @@ class FGAirportList;
 class FGRunwayList;
 class FGAIMgr;
 class FGATCMgr;
-class FGATCDisplay;
 class FGAircraftModel;
 class FGControls;
 class FGFlightPlanDispatcher;
 class FGIO;
 class FGNavList;
+class FGAirwayNetwork;
 class FGTACANList;
 class FGFixList;
 class FGLight;
@@ -85,6 +84,7 @@ class FGTileMgr;
 class FGViewMgr;
 class FGViewer;
 class FGRenderer;
+class FGFontCache;
 
 
 /**
@@ -96,6 +96,13 @@ class FGGlobals
 
 private:
 
+    // properties, destroy last
+    SGPropertyNode_ptr props;
+    SGPropertyNode_ptr initial_state;
+
+    // localization
+    SGPropertyNode_ptr locale;
+
     FGRenderer *renderer;
     SGSubsystemMgr *subsystem_mgr;
     SGEventMgr *event_mgr;
@@ -152,9 +159,6 @@ private:
     // ATC manager
     FGATCMgr *ATC_mgr;
 
-    // ATC Renderer
-    FGATCDisplay *ATC_display;
-
     // AI manager
     FGAIMgr *AI_mgr;
 
@@ -164,17 +168,8 @@ private:
     // viewer manager
     FGViewMgr *viewmgr;
 
-    // properties
-    SGPropertyNode *props;
-    SGPropertyNode *initial_state;
-
-    // localization
-    SGPropertyNode *locale;
-
     SGCommandMgr *commands;
 
-    SGModelLib *model_lib;
-
   //FGFlightPlanDispatcher *fpDispatcher;
 
     FGAircraftModel *acmodel;
@@ -197,6 +192,8 @@ private:
     // Input/Ouput subsystem
     FGIO *io;
 
+    FGFontCache *fontcache;
+
     // Navigational Aids
     FGNavList *navlist;
     FGNavList *loclist;
@@ -207,6 +204,7 @@ private:
     FGNavList *carrierlist;
     FGTACANList *channellist;
     FGFixList *fixlist;
+    FGAirwayNetwork *airwaynet;
 
     //Mulitplayer managers
     FGMultiplayMgr *multiplayer_mgr;
@@ -274,9 +272,6 @@ public:
     inline FGATCMgr *get_ATC_mgr() const { return ATC_mgr; }
     inline void set_ATC_mgr( FGATCMgr *a ) {ATC_mgr = a; }
 
-    inline FGATCDisplay *get_ATC_display() const { return ATC_display; }
-    inline void set_ATC_display( FGATCDisplay *d ) {ATC_display = d; }
-
     inline FGAIMgr *get_AI_mgr() const { return AI_mgr; }
     inline void set_AI_mgr( FGAIMgr *a ) {AI_mgr = a; }
 
@@ -301,12 +296,6 @@ public:
 
     inline SGCommandMgr *get_commands () { return commands; }
 
-    inline SGModelLib * get_model_lib () { return model_lib; }
-
-    inline void set_model_lib (SGModelLib *m) {
-        model_lib = m;
-    }
-
     inline FGAircraftModel *get_aircraft_model () { return acmodel; }
 
     inline void set_aircraft_model (FGAircraftModel * model)
@@ -350,6 +339,7 @@ public:
     inline void set_tile_mgr ( FGTileMgr *t ) { tile_mgr = t; }
 
     inline FGIO* get_io() const { return io; }
+    inline FGFontCache *get_fontcache() const { return fontcache; }
     
     inline FGNavList *get_navlist() const { return navlist; }
     inline void set_navlist( FGNavList *n ) { navlist = n; }
@@ -370,6 +360,10 @@ public:
     inline FGTACANList *get_channellist() const { return channellist; }
     inline void set_channellist( FGTACANList *c ) { channellist = c; }
 
+    inline FGAirwayNetwork *get_airwaynet() const { return airwaynet; }
+    inline void set_airwaynet( FGAirwayNetwork *a ) { airwaynet = a; }
+
+
    /**
      * Save the current state as the initial state.
      */