Merge branch 'merge-requests/1555' into next

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index e241b6297a0630b911ecd03c092aad1380976f6f..11dc124dc3129d41983f94233db6275f9ee19501 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -91,7 +91,6 @@ private:
     FGRenderer *renderer;
     SGSubsystemMgr *subsystem_mgr;
     SGEventMgr *event_mgr;
-    SGSoundMgr *soundmgr;
 
     // Number of milliseconds elapsed since the start of the program.
     double sim_time_sec;
@@ -194,7 +193,7 @@ public:
     void set_fg_root (const std::string &root);
 
     inline const string_list &get_fg_scenery () const { return fg_scenery; }
-    void set_fg_scenery (const std::string &scenery);
+    void append_fg_scenery (const std::string &scenery);
 
     const string_list& get_aircraft_paths() const { return fg_aircraft_dirs; }
     void append_aircraft_path(const std::string& path);
@@ -265,6 +264,10 @@ public:
         acmodel = model;
     }
 
+    const SGGeod & get_aircraft_position() const;
+
+    SGVec3d get_aircraft_positon_cart() const;
+    
     inline FGModelMgr *get_model_mgr () { return model_mgr; }
 
     inline void set_model_mgr (FGModelMgr * mgr)