- implement progress information (enabled by default; can be turned off via

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 2545cd12f1eaa6ac2c7a0f857fb76ca8d56e85b5..1d81c18b6e47903ef6dd4af68a1ee1b4213648f2 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,6 +70,7 @@ class FGATCMgr;
 class FGATCDisplay;
 class FGAircraftModel;
 class FGControls;
+class FGFlightPlanDispatcher;
 class FGIO;
 class FGNavList;
 class FGFixList;
@@ -84,6 +86,7 @@ class FGPanel;
 class FGTileMgr;
 class FGViewMgr;
 class FGViewer;
+class FGRenderer;
 
 
 /**
@@ -95,8 +98,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;
@@ -104,8 +108,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)
@@ -173,6 +177,8 @@ private:
 
     SGModelLib *model_lib;
 
+  //FGFlightPlanDispatcher *fpDispatcher;
+
     FGAircraftModel *acmodel;
 
     FGModelMgr * model_mgr;
@@ -213,9 +219,11 @@ public:
     FGGlobals();
     virtual ~FGGlobals();
 
-    virtual SGSubsystemMgr * get_subsystem_mgr () const;
+    virtual FGRenderer *get_renderer () const;
 
-    virtual SGSubsystem * get_subsystem (const char * name);
+    virtual SGSubsystemMgr *get_subsystem_mgr () const;
+
+    virtual SGSubsystem *get_subsystem (const char * name);
 
     virtual void add_subsystem (const char * name,
                                 SGSubsystem * subsystem,
@@ -223,7 +231,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; }
@@ -232,10 +240,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; }