# include STL_IOSTREAM
# include STL_ITERATOR
#else
-# if defined(sgi) && !defined(__GNUC__)
+# if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
# include <iostream.h>
# else
# include <iostream>
#include "FGScript.h"
#include "FGConfigFile.h"
+namespace JSBSim {
+
static const char *IdSrc = "$Id$";
static const char *IdHdr = ID_FGSCRIPT;
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-bool FGScript::LoadScript(string script)
+bool FGScript::LoadScript( string script )
{
FGConfigFile Script(script);
string token="";
ScriptName = Script.GetValue("name");
Scripted = true;
- if (debug_lvl > 0) cout << "Reading Script File " << ScriptName << endl;
+ if (debug_lvl > 0) cout << "Reading and running from script file " << ScriptName << endl << endl;
while (Script.GetNextConfigLine() != string("EOF") && Script.GetValue() != string("/runscript")) {
token = Script.GetValue();
if (token == "use") {
if ((token = Script.GetValue("aircraft")) != string("")) {
aircraft = token;
- result = FDMExec->LoadModel("aircraft", "engine", aircraft);
+ result = FDMExec->LoadModel(aircraft);
if (!result) {
cerr << "Aircraft file " << aircraft << " was not found" << endl;
exit(-1);
newCondition = new struct condition();
while (token != string("/when")) {
if (token == "parameter") {
- prop_name = State->GetPropertyName( Script.GetValue("name") );
+ prop_name = Script.GetValue("name");
newCondition->TestParam.push_back( PropertyManager->GetNode(prop_name) );
newCondition->TestValue.push_back(strtod(Script.GetValue("value").c_str(), NULL));
newCondition->Comparison.push_back(Script.GetValue("comparison"));
} else if (token == "set") {
- prop_name = State->GetPropertyName( Script.GetValue("name") );
+ prop_name = Script.GetValue("name");
newCondition->SetParam.push_back( PropertyManager->GetNode(prop_name) );
newCondition->SetValue.push_back(strtod(Script.GetValue("value").c_str(), NULL));
newCondition->Triggered.push_back(false);
Debug(4);
- FGInitialCondition IC(FDMExec);
- if ( ! IC.Load("aircraft", aircraft, initialize)) {
+ FGInitialCondition *IC=FDMExec->GetIC();
+ if ( ! IC->Load( initialize )) {
cerr << "Initialization unsuccessful" << endl;
exit(-1);
}
}
}
}
-
+}