Merge branch 'next' of D:\Git_New\flightgear into next

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

diff --git a/src/FDM/JSBSim/input_output/FGScript.h b/src/FDM/JSBSim/input_output/FGScript.h
index 9f8d3ef8e84984bab04bd7857f64fa9ec717ee6d..1ef0cfaa3e5be1e78678619be5a9796274afcf4e 100644 (file)
--- a/src/FDM/JSBSim/input_output/FGScript.h
+++ b/src/FDM/JSBSim/input_output/FGScript.h
@@ -48,7 +48,7 @@ INCLUDES
 DEFINITIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#define ID_FGSCRIPT "$Id: FGScript.h,v 1.18 2010/04/11 13:44:42 jberndt Exp $"
+#define ID_FGSCRIPT "$Id: FGScript.h,v 1.20 2011/02/11 12:43:28 jberndt Exp $"
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 FORWARD DECLARATIONS
@@ -157,7 +157,7 @@ CLASS DOCUMENTATION
     comes the "run" section, where the conditions are
     described in &quot;event&quot; clauses.</p>
     @author Jon S. Berndt
-    @version "$Id: FGScript.h,v 1.18 2010/04/11 13:44:42 jberndt Exp $"
+    @version "$Id: FGScript.h,v 1.20 2011/02/11 12:43:28 jberndt Exp $"
 */
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -178,7 +178,7 @@ public:
       has been supplied on the command line, it will be override the script-
       specified simulation step size.
       @param script the filename (including path name, if any) for the script.
-      @param deltaT a simulation step size from the command line
+      @param deltaT a simulation step size.
       @return true if successful */
   bool LoadScript(string script, double deltaT);
 
@@ -215,8 +215,10 @@ private:
     double           StartTime;
     double           TimeSpan;
     string           Name;
+    string           Description;
     vector <FGPropertyManager*>  SetParam;
     vector <FGPropertyManager*>  NotifyProperties;
+    vector <string>              DisplayString;
     vector <eAction> Action;
     vector <eType>   Type;
     vector <double>  SetValue;