[Jsbsim-cvslogs] CVS: JSBSim/src/models FGLGear.cpp,1.121,1.122

[Bertrand <bco...@us...>]

Update of /cvsroot/jsbsim/JSBSim/src/models
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16941/src/models

Modified Files:
	FGLGear.cpp 
Log Message:
Shortened the succession of tests that determine if a landing gear is fixed, castered or steered

Index: FGLGear.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/FGLGear.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -r1.121 -r1.122
*** FGLGear.cpp	29 Sep 2015 13:22:47 -0000	1.121
--- FGLGear.cpp	16 May 2016 17:47:14 -0000	1.122
***************
*** 155,159 ****
      maxSteerAngle = el->FindElementValueAsNumberConvertTo("max_steer", "DEG");
  
!   if (maxSteerAngle == 360) {
      eSteerType = stCaster;
      Castered = true;
--- 155,162 ----
      maxSteerAngle = el->FindElementValueAsNumberConvertTo("max_steer", "DEG");
  
!   Element* castered_el = el->FindElement("castered");
! 
!   if ((maxSteerAngle == 360 && !castered_el)
!       || (castered_el && castered_el->GetDataAsNumber() != 0.0)) {
      eSteerType = stCaster;
      Castered = true;
***************
*** 165,185 ****
      eSteerType = stSteer;
  
-   Element* castering = el->FindElement("castered");
-   if (castering) {
-     if (castering->GetDataAsNumber() != 0.0) {
-       eSteerType = stCaster;
-       Castered = true;
-     }
-     else {
-       if (maxSteerAngle == 0.0) {
-         eSteerType = stFixed;
-       }
-       else {
-         eSteerType = stSteer;
-       }
-       Castered = false;
-     }
-   }
- 
    GroundReactions = fdmex->GetGroundReactions();
  
--- 168,171 ----