namespace JSBSim {
-static const char *IdSrc = "$Id: FGEngine.cpp,v 1.48 2011/10/31 14:54:41 bcoconni Exp $";
+static const char *IdSrc = "$Id: FGEngine.cpp,v 1.50 2012/03/17 20:46:29 jentron Exp $";
static const char *IdHdr = ID_ENGINE;
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Name = engine_element->GetAttributeValue("name");
- Load(engine_element, PropertyManager, to_string(EngineNumber)); // Call ModelFunctions loader
+ Load(engine_element, PropertyManager, ::to_string(EngineNumber)); // Call ModelFunctions loader
// Find and set engine location
property_name = base_property_name + "/fuel-used-lbs";
PropertyManager->Tie( property_name.c_str(), this, &FGEngine::GetFuelUsedLbs);
- PostLoad(engine_element, PropertyManager, to_string(EngineNumber));
+ PostLoad(engine_element, PropertyManager, ::to_string(EngineNumber));
Debug(0);
}
thruster_filename = thruster_element->GetAttributeValue("file");
if ( !thruster_filename.empty()) {
- thruster_fullpathname = fullpath + thruster_filename + ".xml";
+ thruster_fullpathname = localpath + thruster_filename + ".xml";
thruster_file.open(thruster_fullpathname.c_str());
if ( !thruster_file.is_open()) {
- thruster_fullpathname = localpath + thruster_filename + ".xml";
+ thruster_fullpathname = fullpath + thruster_filename + ".xml";
thruster_file.open(thruster_fullpathname.c_str());
if ( !thruster_file.is_open()) {
cerr << "Could not open thruster file: " << thruster_filename << ".xml" << endl;