Move FGEventMgr and FGSubsystemMgr over to SimGear, add SGEventMgr to FlightGear...

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

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index 032781539b6beae3f007c3bc072bd92268e03eab..4008ba180beff8bae54abdeb6897e84405b2c3be 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -21,11 +21,9 @@
 // $Id$
 
 
-#include <simgear/misc/commands.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 +41,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( "" ),
@@ -57,9 +56,9 @@ FGGlobals::FGGlobals() :
     mag( NULL ),
     autopilot( NULL ),
     route( NULL ),
-    soundmgr( NULL ),
     current_panel( NULL ),
-    environment_mgr( NULL ),
+    soundmgr( NULL ),
+    airports( NULL ),
     ATC_mgr( NULL ),
     ATC_display( NULL ),
     AI_mgr( NULL ),
@@ -69,8 +68,7 @@ FGGlobals::FGGlobals() :
     initial_state( NULL ),
     locale( NULL ),
     commands( new SGCommandMgr ),
-    model_loader( NULL ),
-    texture_loader( NULL ),
+    model_lib( NULL ),
     acmodel( NULL ),
     model_mgr( NULL ),
     channel_options_list( NULL ),
@@ -85,6 +83,7 @@ FGGlobals::FGGlobals() :
 FGGlobals::~FGGlobals() 
 {
   delete subsystem_mgr;
+  delete event_mgr;
   delete initial_state;
   delete props;
   delete commands;
@@ -106,13 +105,13 @@ void FGGlobals::set_fg_root (const string &root) {
 }
 
 
-FGSubsystemMgr *
+SGSubsystemMgr *
 FGGlobals::get_subsystem_mgr () const
 {
     return subsystem_mgr;
 }
 
-FGSubsystem *
+SGSubsystem *
 FGGlobals::get_subsystem (const char * name)
 {
     return subsystem_mgr->get_subsystem(name);
@@ -120,20 +119,48 @@ 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;
+}
+
+
+void
+FGGlobals::add_event (const char * name,
+                      int repeat_value,
+                      int initial_value)
+{
+    event_mgr->add(name, subsystem_mgr->get_subsystem(name),
+                   repeat_value, initial_value);
+}
+
+void
+FGGlobals::add_event (const char * name,
+                      const SGSubsystem * subsystem,
+                      int repeat_value,
+                      int initial_value)
+{
+    event_mgr->add(name, subsystem, repeat_value, initial_value);
+}
+
+
+
 // 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");
 }