set /sim/fg-current to current working directory; getcwd() is defined in

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

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index 6a9b3f88cd92ca2355d5e79080a6d642a0eb7300..ffb8a9fb21c20f4eff372de9b10ed8832f886f58 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -28,6 +28,8 @@
 #include <simgear/structure/commands.hxx>
 #include <simgear/misc/sg_path.hxx>
 
+#include <GUI/new_gui.hxx>
+
 #include "globals.hxx"
 #include "renderer.hxx"
 #include "viewmgr.hxx"
@@ -64,14 +66,13 @@ FGGlobals::FGGlobals() :
     soundmgr( NULL ),
     airports( NULL ),
     ATC_mgr( NULL ),
-    ATC_display( NULL ),
     AI_mgr( NULL ),
     controls( NULL ),
     viewmgr( NULL ),
     props( new SGPropertyNode ),
     initial_state( NULL ),
     locale( NULL ),
-    commands( new SGCommandMgr ),
+    commands( SGCommandMgr::instance() ),
     model_lib( NULL ),
     acmodel( NULL ),
     model_mgr( NULL ),
@@ -80,6 +81,7 @@ FGGlobals::FGGlobals() :
     scenery( NULL ),
     tile_mgr( NULL ),
     io( new FGIO ),
+    fontcache ( new FGFontCache ),
     navlist( NULL ),
     loclist( NULL ),
     gslist( NULL ),
@@ -100,8 +102,8 @@ FGGlobals::~FGGlobals()
     delete event_mgr;
     delete initial_state;
     delete props;
-    delete commands;
     delete io;
+    delete fontcache;
     delete renderer;
     delete initial_waypoints;
 }