fly/flightgear
1
0
Fork 0
Code Activity

sync. with JSBSim again

Browse source
This commit is contained in:
ehofman 2009-06-26 13:27:40 +00:00 committed by Tim Moore
parent 1ed6276f16
commit 6079ff58fd
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/FDM/JSBSim/FGFDMExec.cpp
View file

@ -132,7 +132,7 @@ FGFDMExec::FGFDMExec(FGPropertyManager* root) : Root(root)
Terminate = false; Terminate = false;
IdFDM = FDMctr; // The main (parent) JSBSim instance is always the "zeroth" IdFDM = FDMctr; // The main (parent) JSBSim instance is always the "zeroth"
// instance. "child" instances are loaded last. FDMctr++; // instance. "child" instances are loaded last.
try { try {
char* num = getenv("JSBSIM_DEBUG"); char* num = getenv("JSBSIM_DEBUG");
@ -145,9 +145,6 @@ FGFDMExec::FGFDMExec(FGPropertyManager* root) : Root(root)
if (master == 0) if (master == 0)
master = new FGPropertyManager; master = new FGPropertyManager;
Root = master; Root = master;
// JSBSim Standalone, multiple childs are allowed
FDMctr++;
} }
instance = Root->GetNode("/fdm/jsbsim",IdFDM,true); instance = Root->GetNode("/fdm/jsbsim",IdFDM,true);
@ -189,6 +186,8 @@ FGFDMExec::~FGFDMExec()
PropertyCatalog.clear(); PropertyCatalog.clear();
FDMctr--;
Debug(1); Debug(1);
} }

4
src/FDM/JSBSim/models/flight_control/FGSwitch.cpp
View file

@ -98,10 +98,6 @@ FGSwitch::FGSwitch(FGFCS* fcs, Element* element) : FGFCSComponent(fcs, element)
} }
for (unsigned int i=0; i<test_element->GetNumDataLines(); i++) { for (unsigned int i=0; i<test_element->GetNumDataLines(); i++) {
string input_data = test_element->GetDataLine(i); string input_data = test_element->GetDataLine(i);
while (input_data[0] <= 32) {
input_data = input_data.erase(0,1);
if (input_data.size() <= 1) break;
}
if (input_data.size() <= 1) { if (input_data.size() <= 1) {
// Make sure there are no bad data lines that consist solely of whitespace // Make sure there are no bad data lines that consist solely of whitespace
cerr << fgred << " Bad data line in switch component: " << Name << reset << endl; cerr << fgred << " Bad data line in switch component: " << Name << reset << endl;