fly/flightgear
1
0
Fork 0
Code Activity

Fixed incomplete merge of JSBSim.cxx

Browse source 
Commit 287cc74965 wasn't merged to release/2.2.0
properly by Commit b649f97b19.
This commit is contained in:
ThorstenB 2011-02-06 16:46:36 +01:00
parent ac71778319
commit 591ef4ab01
1 changed files with 0 additions and 21 deletions

21
src/FDM/JSBSim/JSBSim.cxx
View file

@ -144,8 +144,6 @@ FGJSBsim::FGJSBsim( double dt )
} }
} }
resetPropertyState();
fdmex = new FGFDMExec( (FGPropertyManager*)globals->get_props() ); fdmex = new FGFDMExec( (FGPropertyManager*)globals->get_props() );
// Register ground callback. // Register ground callback.
@ -1423,22 +1421,3 @@ void FGJSBsim::update_external_forces(double t_off)
fgSetDouble("/fdm/jsbsim/systems/hook/tailhook-pos-deg", fi); fgSetDouble("/fdm/jsbsim/systems/hook/tailhook-pos-deg", fi);
} }
void FGJSBsim::resetPropertyState()
{
// this code works-around bug #222:
// http://code.google.com/p/flightgear-bugs/issues/detail?id=222
// for whatever reason, having an existing value for the WOW
// property causes the NaNs. Should that be fixed, this code can die
SGPropertyNode* gear = fgGetNode("/fdm/jsbsim/gear", false);
if (!gear) {
return;
}
int index = 0;
SGPropertyNode* unitNode = NULL;
for (; (unitNode = gear->getChild("unit", index)) != NULL; ++index) {
unitNode->removeChild("WOW", 0, false);
}
}