Interim windows build fix

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 889fa40aabe5480c8948078e3e82fc1a3ec134e0..82dd12681ff03050be786207911c88bb46907b40 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -120,12 +120,6 @@ private:
     // Material properties library
     SGSharedPtr<SGMaterialLib> matlib;
 
-    // Global autopilot "route"
-    FGRouteMgr *route_mgr;
-
-    // viewer manager
-    FGViewMgr *viewmgr;
-
     SGCommandMgr *commands;
 
     // list of serial port-like configurations
@@ -135,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
@@ -307,10 +295,6 @@ public:
     inline SGMaterialLib *get_matlib() const { return matlib; }
     void set_matlib( SGMaterialLib *m );
 
-    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; }
 
     /**
@@ -348,13 +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; }