Merge branch 'next' of gitorious.org:fg/flightgear into next

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

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index a2e702c89839bbeaa90713964d149434cf6d9a46..8c8ca52bf75b68d116154d16e079e2998807be1e 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -46,7 +46,6 @@
 #include <Airports/runways.hxx>
 #include <ATCDCL/ATISmgr.hxx>
 #include <Autopilot/route_mgr.hxx>
-#include <Cockpit/panel.hxx>
 #include <GUI/FGFontCache.hxx>
 #include <GUI/gui.h>
 #include <Model/acmodel.hxx>
@@ -134,7 +133,6 @@ FGGlobals::FGGlobals() :
     mag( NULL ),
     matlib( NULL ),
     route_mgr( NULL ),
-    current_panel( NULL ),
     ATIS_mgr( NULL ),
     controls( NULL ),
     viewmgr( NULL ),
@@ -189,7 +187,6 @@ FGGlobals::~FGGlobals()
     delete mag;
     delete matlib;
     delete route_mgr;
-    current_panel = NULL;
 
     delete ATIS_mgr;
 
@@ -338,6 +335,12 @@ SGPath FGGlobals::resolve_maybe_aircraft_path(const std::string& branch) const
   return simgear::ResourceManager::instance()->findPath(branch);
 }
 
+SGPath FGGlobals::resolve_ressource_path(const std::string& branch) const
+{
+  return simgear::ResourceManager::instance()
+    ->findPath(branch, SGPath(fgGetString("/sim/aircraft-dir")));
+}
+
 FGRenderer *
 FGGlobals::get_renderer () const
 {
@@ -519,11 +522,4 @@ void FGGlobals::set_warp_delta( long int d )
   fgSetInt("/sim/time/warp-delta", d);
 }
 
-void FGGlobals::set_current_panel( FGPanel *cp )
-{
-  current_panel = cp;
-// poke the renderer to rebuild the scene node as necessary
-  get_renderer()->panelChanged();
-}
-    
 // end of globals.cxx