sync with latest JSBSim ...

diff --git a/src/FDM/JSBSim/FGAerodynamics.cpp b/src/FDM/JSBSim/FGAerodynamics.cpp
index a24df84bd3517162803127c255d52eef13be6ddb..666dca618efe6685bfcfe0da2d7c5da5bbf8dd1a 100644 (file)
--- a/src/FDM/JSBSim/FGAerodynamics.cpp
+++ b/src/FDM/JSBSim/FGAerodynamics.cpp
@@ -185,7 +185,6 @@ string FGAerodynamics::GetCoefficientStrings(void)
       CoeffStrings += Coeff[axis][sd]->Getname();
     }
   }
-
   return CoeffStrings;
 }
 

diff --git a/src/FDM/JSBSim/FGPropulsion.cpp b/src/FDM/JSBSim/FGPropulsion.cpp
index d95c8971ac22f80f0c098e488a8eda5372776729..2a2ef8cb4d1b8b6ae5a1b6df811949f25d92296d 100644 (file)
--- a/src/FDM/JSBSim/FGPropulsion.cpp
+++ b/src/FDM/JSBSim/FGPropulsion.cpp
@@ -152,6 +152,7 @@ bool FGPropulsion::Load(FGConfigFile* AC_cfg)
   string enginePath = FDMExec->GetEnginePath();
   float xLoc, yLoc, zLoc, Pitch, Yaw;
   int Feed;
+  bool ThrottleAdded = false;
 
 # ifndef macintosh
       fullpath = enginePath + "/";
@@ -176,6 +177,7 @@ bool FGPropulsion::Load(FGConfigFile* AC_cfg)
         engType = Eng_cfg.GetValue();
 
         FCS->AddThrottle();
+        ThrottleAdded = true;
 
         if (engType == "FG_ROCKET") {
           Engines.push_back(new FGRocket(FDMExec, &Eng_cfg));
@@ -213,7 +215,7 @@ bool FGPropulsion::Load(FGConfigFile* AC_cfg)
           cout << "      Z = " << zLoc << endl;
           cout << "      Pitch = " << Pitch << endl;
           cout << "      Yaw = " << Yaw << endl;
-       }
+        }
        
         Engines[numEngines]->SetPlacement(xLoc, yLoc, zLoc, Pitch, Yaw);
         numEngines++;
@@ -288,6 +290,8 @@ bool FGPropulsion::Load(FGConfigFile* AC_cfg)
     AC_cfg->GetNextConfigLine();
   }
 
+  if (!ThrottleAdded) FCS->AddThrottle(); // need to have at least one throttle
+
   return true;
 }