Make yasim accept the launchbar and hook properties. They are not tied to anything...

[flightgear.git] / src / FDM / JSBSim / FGRocket.cpp

diff --git a/src/FDM/JSBSim/FGRocket.cpp b/src/FDM/JSBSim/FGRocket.cpp
index 0d0497b99713c98eed0737a113d176c6ff6d6def..c7131f341071861055b51f89ee1623524523e9dc 100644 (file)
--- a/src/FDM/JSBSim/FGRocket.cpp
+++ b/src/FDM/JSBSim/FGRocket.cpp
@@ -113,28 +113,28 @@ double FGRocket::Calculate(void)
     Flameout = false;
   }
 
-  return Thruster->Calculate(Cf*maxPC*PctPower*propEff);
+  return Thrust = Thruster->Calculate(Cf*maxPC*PctPower*propEff);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-string FGRocket::GetEngineLabels(void)
+string FGRocket::GetEngineLabels(string delimeter)
 {
   std::ostringstream buf;
 
-  buf << Name << "_ChamberPress[" << EngineNumber << "], "
-      << Thruster->GetThrusterLabels(EngineNumber);
+  buf << Name << "_ChamberPress[" << EngineNumber << "]" << delimeter
+      << Thruster->GetThrusterLabels(EngineNumber, delimeter);
 
   return buf.str();
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-string FGRocket::GetEngineValues(void)
+string FGRocket::GetEngineValues(string delimeter)
 {
   std::ostringstream buf;
 
-  buf << PC << ", " << Thruster->GetThrusterValues(EngineNumber);
+  buf << PC << delimeter << Thruster->GetThrusterValues(EngineNumber, delimeter);
 
   return buf.str();
 }