Make use of the new SGPath::add() function and automatically append 'Terren' and...

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

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index fe526872e39dba1193c9c5dbd48d2e91758f5586..97777dcb27ef5a46983506df99492fa13e40f57d 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -21,11 +21,10 @@
 // $Id$
 
 
-#include <simgear/misc/commands.hxx>
+#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/structure/commands.hxx>
 #include <simgear/misc/sg_path.hxx>
 
-#include <Environment/environment_mgr.hxx>
-
 #include "globals.hxx"
 #include "viewmgr.hxx"
 
@@ -43,7 +42,8 @@ FGGlobals *globals;
 
 // Constructor
 FGGlobals::FGGlobals() :
-    subsystem_mgr( new FGSubsystemMgr ),
+    subsystem_mgr( new SGSubsystemMgr ),
+    event_mgr( new SGEventMgr ),
     sim_time_sec( 0.0 ),
     fg_root( "" ),
     fg_scenery( "" ),
@@ -55,11 +55,10 @@ FGGlobals::FGGlobals() :
     time_params( NULL ),
     ephem( NULL ),
     mag( NULL ),
-    autopilot( NULL ),
-    route( NULL ),
+    route_mgr( NULL ),
     current_panel( NULL ),
     soundmgr( NULL ),
-    environment_mgr( NULL ),
+    airports( NULL ),
     ATC_mgr( NULL ),
     ATC_display( NULL ),
     AI_mgr( NULL ),
@@ -73,9 +72,16 @@ FGGlobals::FGGlobals() :
     acmodel( NULL ),
     model_mgr( NULL ),
     channel_options_list( NULL ),
+    initial_waypoints(0),
     scenery( NULL ),
     tile_mgr( NULL ),
-    io( new FGIO )
+    io( new FGIO ),
+    navlist( NULL ),
+    loclist( NULL ),
+    gslist( NULL ),
+    dmelist( NULL ),
+    mkrlist( NULL ),
+    fixlist( NULL )
 {
 }
 
@@ -83,11 +89,18 @@ FGGlobals::FGGlobals() :
 // Destructor
 FGGlobals::~FGGlobals() 
 {
-  delete subsystem_mgr;
-  delete initial_state;
-  delete props;
-  delete commands;
-  delete io;
+    delete soundmgr;
+    delete subsystem_mgr;
+    delete event_mgr;
+    delete initial_state;
+    delete props;
+    delete commands;
+    delete io;
+  
+    // make sure only to delete the initial waypoints list if it acually
+    // still exists. 
+    if (initial_waypoints)
+        delete initial_waypoints;
 }
 
 
@@ -104,14 +117,46 @@ void FGGlobals::set_fg_root (const string &root) {
         }
 }
 
+void FGGlobals::set_fg_scenery (const string &scenery) {
+
+    if (scenery.empty())
+        return;
+
+    SGPath pt( scenery ), po( scenery );
+    pt.append("Terrain");
+    po.append("Objects");
+
+cout << "pt: " << pt.str() << endl;
+cout << "po: " << po.str() << endl;
+    ulDir *td = ulOpenDir(pt.c_str());
+    ulDir *od = ulOpenDir(po.c_str());
+
+    if (td == NULL) {
+        if (od == NULL) {
+            fg_scenery = scenery;
+        } else {
+            fg_scenery = po.str();
+            ulCloseDir(od);
+        }
+    } else {
+        if (od != NULL) {
+            pt.add(po.str());
+            ulCloseDir(od);
+        }
+        fg_scenery = pt.str();
+        ulCloseDir(td);
+    }
+cout << "fg_scenery: " << fg_scenery << endl;
+}
+
 
-FGSubsystemMgr *
+SGSubsystemMgr *
 FGGlobals::get_subsystem_mgr () const
 {
     return subsystem_mgr;
 }
 
-FGSubsystem *
+SGSubsystem *
 FGGlobals::get_subsystem (const char * name)
 {
     return subsystem_mgr->get_subsystem(name);
@@ -119,20 +164,28 @@ FGGlobals::get_subsystem (const char * name)
 
 void
 FGGlobals::add_subsystem (const char * name,
-                          FGSubsystem * subsystem,
-                          FGSubsystemMgr::GroupType type,
+                          SGSubsystem * subsystem,
+                          SGSubsystemMgr::GroupType type,
                           double min_time_sec)
 {
     subsystem_mgr->add(name, subsystem, type, min_time_sec);
 }
 
 
+SGEventMgr *
+FGGlobals::get_event_mgr () const
+{
+    return event_mgr;
+}
+
+
 // Save the current state as the initial state.
 void
 FGGlobals::saveInitialState ()
 {
   delete initial_state;
   initial_state = new SGPropertyNode();
+
   if (!copyProperties(props, initial_state))
     SG_LOG(SG_GENERAL, SG_ALERT, "Error saving initial state");
 }