Interim windows build fix

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index cf8680ac3c9233d969df7322f374b8040a754659..82dd12681ff03050be786207911c88bb46907b40 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -107,6 +107,7 @@ private:
 
     // Roots of FlightGear scenery tree
     string_list fg_scenery;
+    string_list secure_fg_scenery;
 
     std::string browser;
 
@@ -119,15 +120,6 @@ private:
     // Material properties library
     SGSharedPtr<SGMaterialLib> matlib;
 
-    // Global autopilot "route"
-    FGRouteMgr *route_mgr;
-
-    // control input state
-    FGControls *controls;
-
-    // viewer manager
-    FGViewMgr *viewmgr;
-
     SGCommandMgr *commands;
 
     // list of serial port-like configurations
@@ -137,12 +129,6 @@ private:
     // and or flight-plan file during initialization
     string_list *initial_waypoints;
 
-    // FlightGear scenery manager
-    SGSharedPtr<FGScenery> _scenery;
-
-    // Tile manager
-    SGSharedPtr<FGTileMgr> _tile_mgr;
-
     FGFontCache *fontcache;
 
     // Navigational Aids
@@ -179,19 +165,36 @@ public:
     virtual FGRenderer *get_renderer () const;
     void set_renderer(FGRenderer* render);
     
-    virtual SGSubsystemMgr *get_subsystem_mgr () const;
+    SGSubsystemMgr *get_subsystem_mgr () const;
 
-    virtual SGSubsystem *get_subsystem (const char * name);
+    SGSubsystem *get_subsystem (const char * name) const;
 
-    virtual void add_subsystem (const char * name,
+    template<class T>
+    T* get_subsystem() const
+    {
+        return dynamic_cast<T*>(get_subsystem(T::subsystemName()));
+    }
+
+
+    void add_subsystem (const char * name,
                                 SGSubsystem * subsystem,
                                 SGSubsystemMgr::GroupType
                                 type = SGSubsystemMgr::GENERAL,
                                 double min_time_sec = 0);
 
-    virtual SGEventMgr *get_event_mgr () const;
+    template<class T>
+    T* add_new_subsystem (SGSubsystemMgr::GroupType
+                                type = SGSubsystemMgr::GENERAL,
+                                double min_time_sec = 0)
+    {
+        T* sub = new T;
+        add_subsystem(T::subsystemName(), sub, type, min_time_sec);
+        return sub;
+    }
 
-    virtual SGSoundMgr *get_soundmgr () const;
+    SGEventMgr *get_event_mgr () const;
+
+    SGSoundMgr *get_soundmgr () const;
 
     inline double get_sim_time_sec () const { return sim_time_sec; }
     inline void inc_sim_time_sec (double dt) { sim_time_sec += dt; }
@@ -224,7 +227,16 @@ public:
     void set_fg_home (const std::string &home);
 
     inline const string_list &get_fg_scenery () const { return fg_scenery; }
-    void append_fg_scenery (const std::string &scenery);
+    inline const string_list &get_secure_fg_scenery () const { return secure_fg_scenery; }
+    /**
+     * Add a scenery directory
+     *
+     * secure = allow Nasal to read this directory; to avoid
+     * can-read-any-file security holes, do NOT set this on directories
+     * obtained from the property tree (e.g. /sim/terrasync/scenery-dir)
+     * or other Nasal-writable places
+     */ 
+    void append_fg_scenery (const std::string &scenery, bool secure = false);
 
     void clear_fg_scenery();
 
@@ -283,13 +295,6 @@ public:
     inline SGMaterialLib *get_matlib() const { return matlib; }
     void set_matlib( SGMaterialLib *m );
 
-    inline FGControls *get_controls() const { return controls; }
-    inline void set_controls( FGControls *c ) { controls = c; }
-
-    inline FGViewMgr *get_viewmgr() const { return viewmgr; }
-    inline void set_viewmgr( FGViewMgr *vm ) { viewmgr = vm; }
-    FGViewer *get_current_view() const;
-
     inline SGPropertyNode *get_props () { return props; }
 
     /**
@@ -327,11 +332,14 @@ public:
         initial_waypoints = list;
     }
 
+    FGViewMgr *get_viewmgr() const;
+    FGViewer *get_current_view() const;
+
+    FGControls *get_controls() const;
+
     FGScenery * get_scenery () const;
-    void set_scenery ( FGScenery *s );
 
     FGTileMgr * get_tile_mgr () const;
-    void set_tile_mgr ( FGTileMgr *t );
 
     inline FGFontCache *get_fontcache() const { return fontcache; }