- Added ultra-light traffic is now a separate traffic class that can have its

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index e59a6b79e175335697e765fd5ca0bbf516142d69..8db8f5557e9b4d761024f5e0a9d6fbafcb17a5fb 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$
 
@@ -67,27 +67,25 @@ class FGAirportList;
 class FGRunwayList;
 class FGAIMgr;
 class FGATCMgr;
-class FGATCDisplay;
 class FGAircraftModel;
 class FGControls;
 class FGFlightPlanDispatcher;
 class FGIO;
 class FGNavList;
-class FGNasalDisplay;
+class FGAirwayNetwork;
 class FGTACANList;
 class FGFixList;
 class FGLight;
 class FGModelMgr;
 class FGRouteMgr;
 class FGScenery;
-#ifdef FG_MPLAYER_AS
 class FGMultiplayMgr;
-#endif
 class FGPanel;
 class FGTileMgr;
 class FGViewMgr;
 class FGViewer;
 class FGRenderer;
+class FGFontCache;
 
 
 /**
@@ -155,9 +153,6 @@ private:
     // ATC manager
     FGATCMgr *ATC_mgr;
 
-    // ATC Renderer
-    FGATCDisplay *ATC_display;
-
     // AI manager
     FGAIMgr *AI_mgr;
 
@@ -200,6 +195,8 @@ private:
     // Input/Ouput subsystem
     FGIO *io;
 
+    FGFontCache *fontcache;
+
     // Navigational Aids
     FGNavList *navlist;
     FGNavList *loclist;
@@ -210,15 +207,10 @@ private:
     FGNavList *carrierlist;
     FGTACANList *channellist;
     FGFixList *fixlist;
-    
-    // Scripting display
-    FGNasalDisplay * Nasal_display;
-
+    FGAirwayNetwork *airwaynet;
 
-#ifdef FG_MPLAYER_AS
     //Mulitplayer managers
     FGMultiplayMgr *multiplayer_mgr;
-#endif
 
 public:
 
@@ -283,9 +275,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; }
 
@@ -330,7 +319,6 @@ public:
       model_mgr = mgr;
     }
 
-#ifdef FG_MPLAYER_AS
     inline FGMultiplayMgr *get_multiplayer_mgr () { return multiplayer_mgr; }
 
     inline void set_multiplayer_mgr (FGMultiplayMgr * mgr)
@@ -338,8 +326,6 @@ public:
       multiplayer_mgr = mgr;
     }
 
-#endif
-
     inline string_list *get_channel_options_list () {
        return channel_options_list;
     }
@@ -362,10 +348,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 FGNasalDisplay *get_Nasal_display() const { return Nasal_display; }
-    inline void set_Nasal_display( FGNasalDisplay *d ) {Nasal_display = d; }    
-
     inline FGNavList *get_navlist() const { return navlist; }
     inline void set_navlist( FGNavList *n ) { navlist = n; }
     inline FGNavList *get_loclist() const { return loclist; }
@@ -385,6 +369,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.
      */