Added FGScript.{cpp,h}

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 62dac4b243f075b51789a1feb9faad323eeef28d..170fe8235823c2e3b61b5c415b9fd639137591a2 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -34,17 +34,22 @@
 #include <simgear/magvar/magvar.hxx>
 #include <simgear/route/route.hxx>
 #include <simgear/timing/sg_time.hxx>
+#include <simgear/misc/commands.hxx>
 #include <simgear/misc/props.hxx>
 
-#include "soundmgr.hxx"
-#include "viewmgr.hxx"
-
-FG_USING_STD( vector );
-FG_USING_STD( string );
+SG_USING_STD( vector );
+SG_USING_STD( string );
 
 typedef vector<string> string_list;
 
 
+// Forward declarations
+class FGControls;
+class FGSoundMgr;
+class FGFX;
+class FGViewMgr;
+class FGViewer;
+
 class FGGlobals {
 
 private:
@@ -81,7 +86,13 @@ private:
     // sound manager
     FGSoundMgr *soundmgr;
 
-    // viewer maneger
+    // sound-effects manager
+    FGFX *fx;
+
+    // control input state
+    FGControls *controls;
+
+    // viewer manager
     FGViewMgr *viewmgr;
     FGViewer *current_view;
 
@@ -89,6 +100,8 @@ private:
     SGPropertyNode *props;
     SGPropertyNode *initial_state;
 
+    SGCommandMgr *commands;
+
     // list of serial port-like configurations
     string_list *channel_options_list;
 
@@ -131,6 +144,12 @@ public:
     inline FGSoundMgr *get_soundmgr() const { return soundmgr; }
     inline void set_soundmgr( FGSoundMgr *sm ) { soundmgr = sm; }
 
+    inline FGFX *get_fx() const { return fx; }
+    inline void set_fx( FGFX *x ) { fx = x; }
+
+    inline FGControls *get_controls() const { return controls; }
+    inline void set_controls( FGControls *c ) { controls = c; }
+
     inline FGViewMgr *get_viewmgr() const { return viewmgr; }
     inline void set_viewmgr( FGViewMgr *vm ) { viewmgr = vm; }
     inline FGViewer *get_current_view() const { return current_view; }
@@ -139,6 +158,8 @@ public:
     inline SGPropertyNode *get_props () { return props; }
     inline void set_props( SGPropertyNode *n ) { props = n; }
 
+    inline SGCommandMgr *get_commands () { return commands; }
+
     inline string_list *get_channel_options_list () {
        return channel_options_list;
     }