Updates from JSBSim, including new turbine engine model from David Culp

[flightgear.git] / src / FDM / JSBSim / FGScript.h

diff --git a/src/FDM/JSBSim/FGScript.h b/src/FDM/JSBSim/FGScript.h
index d1ccc88a6275655a1f871683158cd67bb4aac7ae..269a96f0d9dae9a5a309fcf8f442c9ec9642d2b9 100644 (file)
--- a/src/FDM/JSBSim/FGScript.h
+++ b/src/FDM/JSBSim/FGScript.h
@@ -63,6 +63,10 @@ CLASS DOCUMENTATION
 /** Encapsulates the JSBSim scripting capability.
     @author Jon S. Berndt
     @version $Id$
+    @see <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/jsbsim/JSBSim/FGScript.h?rev=HEAD&content-type=text/vnd.viewcvs-markup">
+         Header File </a>
+    @see <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/jsbsim/JSBSim/FGScript.cpp?rev=HEAD&content-type=text/vnd.viewcvs-markup">
+         Source File </a>
 
     <h4>Scripting support provided via FGScript.</h4>
 
@@ -129,6 +133,8 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 class FGScript : public FGJSBBase
 {
 public:
@@ -142,7 +148,7 @@ public:
       The language is the Simple Script Directives for JSBSim (SSDJ).
       @param script the filename (including path name, if any) for the script.
       @return true if successful */
-  bool LoadScript(string script);
+  bool LoadScript( string script );
 
   /** This function is called each pass through the executive Run() method IF
       scripting is enabled. 
@@ -163,8 +169,8 @@ private:
   };
 
   struct condition {
-    vector <eParam>  TestParam;
-    vector <eParam>  SetParam;
+    vector <FGPropertyManager*>  TestParam;
+    vector <FGPropertyManager*>  SetParam;
     vector <double>  TestValue;
     vector <double>  SetValue;
     vector <string>  Comparison;
@@ -191,9 +197,10 @@ private:
 
   FGFDMExec* FDMExec;
   FGState* State;
+  FGPropertyManager* PropertyManager;
   void Debug(int from);
 };
-
+}
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 #endif