don't destroy iterated map entries; delete _menubar; restore closed

[flightgear.git] / src / Model / acmodel.hxx

diff --git a/src/Model/acmodel.hxx b/src/Model/acmodel.hxx
index 0e6fe2235c54df27607fe985d9f0b240f548d7e6..e15705374f0293bdf003f74d0749cb81b427d280 100644 (file)
--- a/src/Model/acmodel.hxx
+++ b/src/Model/acmodel.hxx
@@ -11,11 +11,12 @@
 #endif
 
 #include <vector>
+#include <string>
 
 SG_USING_STD(string);
 SG_USING_STD(vector);
 
-#include <Main/fgfs.hxx>       // for FGSubsystem
+#include <simgear/structure/subsystem_mgr.hxx> // for SGSubsystem
 
 
 // Don't pull in the headers, since we don't need them here.
@@ -24,7 +25,7 @@ class ssgSelector;
 class SGModelPlacement;
 
 
-class FGAircraftModel : public FGSubsystem
+class FGAircraftModel : public SGSubsystem
 {
 public:
 
@@ -37,6 +38,7 @@ public:
   virtual void update (double dt);
   virtual void draw ();
   virtual SGModelPlacement * get3DModel() { return _aircraft; }
+  void select( bool s ) { _selector->select( s ? 0xffffffff : 0 ); }
 
 private: