From: ThorstenB <brehmt@gmail.com>
Date: Sun, 6 Feb 2011 15:46:36 +0000 (+0100)
Subject: Fixed incomplete merge of JSBSim.cxx
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=591ef4ab0157f79d35486a5c7ac1e16147cda7af;p=flightgear.git

Fixed incomplete merge of JSBSim.cxx
Commit 287cc74965e11ff3888117a9d9b88ed2bdbb9252 wasn't merged to release/2.2.0
properly by Commit b649f97b19b60ae273bf18e25b9539363b3d1c9a.
---

diff --git a/src/FDM/JSBSim/JSBSim.cxx b/src/FDM/JSBSim/JSBSim.cxx
index 0f8d5130a..8b693bcab 100644
--- a/src/FDM/JSBSim/JSBSim.cxx
+++ b/src/FDM/JSBSim/JSBSim.cxx
@@ -144,8 +144,6 @@ FGJSBsim::FGJSBsim( double dt )
         }
     }
     
-    resetPropertyState();
-
     fdmex = new FGFDMExec( (FGPropertyManager*)globals->get_props() );
 
     // Register ground callback.
@@ -1423,22 +1421,3 @@ void FGJSBsim::update_external_forces(double t_off)
     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);
-  }
-}
-