Make yasim accept the launchbar and hook properties. They are not tied to anything...

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

diff --git a/src/FDM/JSBSim/FGScript.h b/src/FDM/JSBSim/FGScript.h
index d1ccc88a6275655a1f871683158cd67bb4aac7ae..7b4587a92f770dad1f5cb7ae2dd9960fc5276959 100644 (file)
--- a/src/FDM/JSBSim/FGScript.h
+++ b/src/FDM/JSBSim/FGScript.h
@@ -52,23 +52,18 @@ DEFINITIONS
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-COMMENTS, REFERENCES, and NOTES [use "class documentation" below for API docs]
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
+namespace JSBSim {
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DOCUMENTATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 /** Encapsulates the JSBSim scripting capability.
-    @author Jon S. Berndt
-    @version $Id$
-
     <h4>Scripting support provided via FGScript.</h4>
 
     <p>There is simple scripting support provided in the FGScript
-    class. Commands are specified using the <u>Simple Scripting
-    Directives for JSBSim</u> (SSDJ). The script file is in XML
+    class. Commands are specified using the <em>Simple Scripting
+    Directives for JSBSim</em> (SSDJ). The script file is in XML
     format. A test condition (or conditions) can be set up in the
     script and when the condition evaluates to true, the specified
     action[s] is/are taken. A test condition can be <em>persistent</em>,
@@ -122,6 +117,8 @@ CLASS DOCUMENTATION
     to be used are specified in the &quot;use&quot; lines. Next,
     comes the &quot;run&quot; section, where the conditions are
     described in &quot;when&quot; clauses.</p>
+    @author Jon S. Berndt
+    @version "$Id$"
 
 */
 
@@ -142,7 +139,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 +160,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 +188,10 @@ private:
 
   FGFDMExec* FDMExec;
   FGState* State;
+  FGPropertyManager* PropertyManager;
   void Debug(int from);
 };
-
+}
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 #endif