- implement progress information (enabled by default; can be turned off via

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

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index aa9f37aa2d870e4b725d0d220a2b822a0f552573..1559a9600382ef957c64e1f8b733f9d341ba1c3b 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started July 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -26,6 +26,7 @@
 #include <simgear/misc/sg_path.hxx>
 
 #include "globals.hxx"
+#include "renderer.hxx"
 #include "viewmgr.hxx"
 
 #include "fg_props.hxx"
@@ -42,6 +43,7 @@ FGGlobals *globals;
 
 // Constructor
 FGGlobals::FGGlobals() :
+    renderer( new FGRenderer ),
     subsystem_mgr( new SGSubsystemMgr ),
     event_mgr( new SGEventMgr ),
     sim_time_sec( 0.0 ),
@@ -71,7 +73,7 @@ FGGlobals::FGGlobals() :
     acmodel( NULL ),
     model_mgr( NULL ),
     channel_options_list( NULL ),
-    initial_waypoints(0),
+    initial_waypoints( NULL ),
     scenery( NULL ),
     tile_mgr( NULL ),
     io( new FGIO ),
@@ -95,11 +97,8 @@ FGGlobals::~FGGlobals()
     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;
+    delete renderer;
+    delete initial_waypoints;
 }
 
 
@@ -129,7 +128,7 @@ void FGGlobals::set_fg_scenery (const string &scenery) {
 
     for (unsigned i = 0; i < path_list.size(); i++) {
 
-        ulDir *d = ulOpenDir( path_list[0].c_str() );
+        ulDir *d = ulOpenDir( path_list[i].c_str() );
         if (d == NULL)
             continue;
         ulCloseDir( d );
@@ -157,6 +156,12 @@ void FGGlobals::set_fg_scenery (const string &scenery) {
 }
 
 
+FGRenderer *
+FGGlobals::get_renderer () const
+{
+   return renderer;
+}
+
 SGSubsystemMgr *
 FGGlobals::get_subsystem_mgr () const
 {