cosmetic changes *only*:

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 6af7367660fd8d81f043032cd8750f3061c49212..9182326ee245bd0f01545bdb33ae3af4e139a137 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -42,8 +42,6 @@ SG_USING_STD( string );
 typedef vector<string> string_list;
 
 
-#include "renderer.hxx"
-
 // Forward declarations
 
 // This file is included, directly or indirectly, almost everywhere in
@@ -59,7 +57,6 @@ class SGEphemeris;
 class SGCommandMgr;
 class SGMagVar;
 class SGMaterialLib;
-class SGModelLib;
 class SGPropertyNode;
 class SGTime;
 class SGSoundMgr;
@@ -69,25 +66,25 @@ 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;
 class FGModelMgr;
 class FGRouteMgr;
 class FGScenery;
-#ifdef FG_MPLAYER_AS
-class FGMultiplayRxMgr;
-class FGMultiplayTxMgr;
-#endif
+class FGMultiplayMgr;
 class FGPanel;
 class FGTileMgr;
 class FGViewMgr;
 class FGViewer;
+class FGRenderer;
+class FGFontCache;
 
 
 /**
@@ -99,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;
@@ -155,9 +159,6 @@ private:
     // ATC manager
     FGATCMgr *ATC_mgr;
 
-    // ATC Renderer
-    FGATCDisplay *ATC_display;
-
     // AI manager
     FGAIMgr *AI_mgr;
 
@@ -167,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;
@@ -200,20 +192,22 @@ private:
     // Input/Ouput subsystem
     FGIO *io;
 
+    FGFontCache *fontcache;
+
     // Navigational Aids
     FGNavList *navlist;
     FGNavList *loclist;
     FGNavList *gslist;
     FGNavList *dmelist;
     FGNavList *mkrlist;
+    FGNavList *tacanlist;
+    FGNavList *carrierlist;
+    FGTACANList *channellist;
     FGFixList *fixlist;
+    FGAirwayNetwork *airwaynet;
 
-#ifdef FG_MPLAYER_AS
     //Mulitplayer managers
-    FGMultiplayTxMgr *multiplayer_tx_mgr;
-
-    FGMultiplayRxMgr *multiplayer_rx_mgr;
-#endif
+    FGMultiplayMgr *multiplayer_mgr;
 
 public:
 
@@ -278,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; }
 
@@ -305,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)
@@ -325,22 +310,13 @@ public:
       model_mgr = mgr;
     }
 
-#ifdef FG_MPLAYER_AS
-    inline FGMultiplayTxMgr *get_multiplayer_tx_mgr () { return multiplayer_tx_mgr; }
+    inline FGMultiplayMgr *get_multiplayer_mgr () { return multiplayer_mgr; }
 
-    inline void set_multiplayer_tx_mgr (FGMultiplayTxMgr * mgr)
+    inline void set_multiplayer_mgr (FGMultiplayMgr * mgr)
     {
-      multiplayer_tx_mgr = mgr;
+      multiplayer_mgr = mgr;
     }
 
-    inline FGMultiplayRxMgr *get_multiplayer_rx_mgr () { return multiplayer_rx_mgr; }
-
-    inline void set_multiplayer_rx_mgr (FGMultiplayRxMgr * mgr)
-    {
-      multiplayer_rx_mgr = mgr;
-    }
-#endif
-
     inline string_list *get_channel_options_list () {
        return channel_options_list;
     }
@@ -363,7 +339,8 @@ 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; }
     inline FGNavList *get_loclist() const { return loclist; }
@@ -372,11 +349,20 @@ public:
     inline void set_gslist( FGNavList *n ) { gslist = n; }
     inline FGNavList *get_dmelist() const { return dmelist; }
     inline void set_dmelist( FGNavList *n ) { dmelist = n; }
+    inline FGNavList *get_tacanlist() const { return tacanlist; }
+    inline void set_tacanlist( FGNavList *n ) { tacanlist = n; }
+    inline FGNavList *get_carrierlist() const { return carrierlist; }
+    inline void set_carrierlist( FGNavList *n ) { carrierlist = n; }
     inline FGNavList *get_mkrlist() const { return mkrlist; }
     inline void set_mkrlist( FGNavList *n ) { mkrlist = n; }
-
     inline FGFixList *get_fixlist() const { return fixlist; }
     inline void set_fixlist( FGFixList *f ) { fixlist = f; }
+    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.