Fix line endings

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index a650f83b514c04c480d6a58215f140410da51df4..d9b285b95d8fd8ee4f6be61e6c4305dad4a39bc7 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started July 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -62,6 +62,7 @@ class SGPropertyNode;
 class SGTime;
 class SGSoundMgr;
 
+
 class FGAirportList;
 class FGRunwayList;
 class FGAIMgr;
@@ -69,19 +70,21 @@ class FGATCMgr;
 class FGATCDisplay;
 class FGAircraftModel;
 class FGControls;
+class FGFlightPlanDispatcher;
 class FGIO;
+class FGNavList;
+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;
 
 
 /**
@@ -93,8 +96,9 @@ class FGGlobals
 
 private:
 
-    SGSubsystemMgr * subsystem_mgr;
-    SGEventMgr * event_mgr;
+    FGRenderer *renderer;
+    SGSubsystemMgr *subsystem_mgr;
+    SGEventMgr *event_mgr;
 
     // Number of milliseconds elapsed since the start of the program.
     double sim_time_sec;
@@ -102,8 +106,8 @@ private:
     // Root of FlightGear data tree
     string fg_root;
 
-    // Root of FlightGear scenery tree
-    string fg_scenery;
+    // Roots of FlightGear scenery tree
+    string_list fg_scenery;
 
     // Fullscreen mode for old 3DFX cards.
 #if defined(FX) && defined(XMESA)
@@ -171,6 +175,8 @@ private:
 
     SGModelLib *model_lib;
 
+  //FGFlightPlanDispatcher *fpDispatcher;
+
     FGAircraftModel *acmodel;
 
     FGModelMgr * model_mgr;
@@ -178,6 +184,10 @@ private:
     // list of serial port-like configurations
     string_list *channel_options_list;
 
+    // A list of initial waypoints that are read from the command line
+    // and or flight-plan file during initialization
+    string_list *initial_waypoints;
+
     // FlightGear scenery manager
     FGScenery *scenery;
 
@@ -187,21 +197,30 @@ private:
     // Input/Ouput subsystem
     FGIO *io;
 
-#ifdef FG_MPLAYER_AS
-    //Mulitplayer managers
-    FGMultiplayTxMgr *multiplayer_tx_mgr;
+    // Navigational Aids
+    FGNavList *navlist;
+    FGNavList *loclist;
+    FGNavList *gslist;
+    FGNavList *dmelist;
+    FGNavList *mkrlist;
+    FGNavList *tacanlist;
+    FGNavList *carrierlist;
+    FGTACANList *channellist;
+    FGFixList *fixlist;
 
-    FGMultiplayRxMgr *multiplayer_rx_mgr;
-#endif
+    //Mulitplayer managers
+    FGMultiplayMgr *multiplayer_mgr;
 
 public:
 
     FGGlobals();
     virtual ~FGGlobals();
 
-    virtual SGSubsystemMgr * get_subsystem_mgr () const;
+    virtual FGRenderer *get_renderer () const;
+
+    virtual SGSubsystemMgr *get_subsystem_mgr () const;
 
-    virtual SGSubsystem * get_subsystem (const char * name);
+    virtual SGSubsystem *get_subsystem (const char * name);
 
     virtual void add_subsystem (const char * name,
                                 SGSubsystem * subsystem,
@@ -209,7 +228,7 @@ public:
                                 type = SGSubsystemMgr::GENERAL,
                                 double min_time_sec = 0);
 
-    virtual SGEventMgr * get_event_mgr () const;
+    virtual SGEventMgr *get_event_mgr () const;
 
     inline double get_sim_time_sec () const { return sim_time_sec; }
     inline void inc_sim_time_sec (double dt) { sim_time_sec += dt; }
@@ -218,10 +237,8 @@ public:
     inline const string &get_fg_root () const { return fg_root; }
     void set_fg_root (const string &root);
 
-    inline const string &get_fg_scenery () const { return fg_scenery; }
-    inline void set_fg_scenery (const string &scenery) {
-      fg_scenery = scenery;
-    }
+    inline const string_list &get_fg_scenery () const { return fg_scenery; }
+    void set_fg_scenery (const string &scenery);
 
 #if defined(FX) && defined(XMESA)
     inline bool get_fullscreen() const { return fullscreen; }
@@ -304,22 +321,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;
     }
@@ -327,6 +335,14 @@ public:
        channel_options_list = l;
     }
 
+    inline string_list *get_initial_waypoints () {
+        return initial_waypoints;
+    }
+  
+    inline void set_initial_waypoints (string_list *list) {
+        initial_waypoints = list;
+    }
+
     inline FGScenery * get_scenery () const { return scenery; }
     inline void set_scenery ( FGScenery *s ) { scenery = s; }
 
@@ -334,8 +350,27 @@ public:
     inline void set_tile_mgr ( FGTileMgr *t ) { tile_mgr = t; }
 
     inline FGIO* get_io() const { return io; }
-
-    /**
+    
+    inline FGNavList *get_navlist() const { return navlist; }
+    inline void set_navlist( FGNavList *n ) { navlist = n; }
+    inline FGNavList *get_loclist() const { return loclist; }
+    inline void set_loclist( FGNavList *n ) { loclist = n; }
+    inline FGNavList *get_gslist() const { return gslist; }
+    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; }
+
+   /**
      * Save the current state as the initial state.
      */
     void saveInitialState ();