fly/flightgear
1
0
Fork 0
Code Activity

sync with latest JSBSim ...

Browse source
This commit is contained in:
curt 2001-07-12 17:55:27 +00:00
parent 68a9746afe
commit 1cdcaef13d
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/FDM/JSBSim/FGAerodynamics.cpp
View file

@ -185,7 +185,6 @@ string FGAerodynamics::GetCoefficientStrings(void)
CoeffStrings += Coeff[axis][sd]->Getname(); CoeffStrings += Coeff[axis][sd]->Getname();
} }
} }
return CoeffStrings; return CoeffStrings;
} }

6
src/FDM/JSBSim/FGPropulsion.cpp
View file

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