#endif
#include <simgear/compiler.h>
+#include <simgear/sg_inlines.h>
#include <stdio.h> // size_t
#include <string>
FGTank* tank = Propulsion->GetTank(i);
d = node->getNode( "density-ppg", true )->getDoubleValue();
- if( d > 0.0 )
+ if( d > 0.0 ) {
tank->SetDensity( d );
+ } else {
+ node->getNode( "density-ppg", true )->setDoubleValue( SG_MAX2<double>(tank->GetDensity(), 0.1) );
+ }
d = node->getNode( "level-lbs", true )->getDoubleValue();
- if( d > 0.0 )
+ if( d > 0.0 ) {
tank->SetContents( d );
+ } else {
+ node->getNode( "level-lbs", true )->setDoubleValue( tank->GetContents() );
+ }
+ /* Capacity is read-only in FGTank and can't be overwritten from FlightGear */
+ node->getNode("capacity-gal_us", true )->setDoubleValue( tank->GetCapacityGallons() );
}
Propulsion->SetFuelFreeze((fgGetNode("/sim/freeze/fuel",true))->getBoolValue());
}
FGJSBBase::Message* msg;
- while (msg = fdmex->ProcessNextMessage()) {
+ while ((msg = fdmex->ProcessNextMessage()) != NULL) {
// msg = fdmex->ProcessNextMessage();
switch (msg->type) {
case FGJSBBase::Message::eText:
} // end FGTurbine code block
case FGEngine::etRocket:
{ // FGRocket code block
- FGRocket* eng = (FGRocket*)Propulsion->GetEngine(i);
+// FGRocket* eng = (FGRocket*)Propulsion->GetEngine(i);
break;
} // end FGRocket code block
case FGEngine::etTurboprop:
break;
case FGEngine::etRocket:
{ // FGRocket code block
- FGRocket* eng = (FGRocket*)Propulsion->GetEngine(i);
+// FGRocket* eng = (FGRocket*)Propulsion->GetEngine(i);
} // end FGRocket code block
break;
case FGEngine::etTurbine:
node->setDoubleValue("egt-degf", 32 + eng->GetEGT()*9/5);
node->setBoolValue("augmentation", eng->GetAugmentation());
node->setBoolValue("water-injection", eng->GetInjection());
- node->setBoolValue("ignition", eng->GetIgnition());
+ node->setBoolValue("ignition", eng->GetIgnition() != 0);
node->setDoubleValue("nozzle-pos-norm", eng->GetNozzle());
node->setDoubleValue("inlet-pos-norm", eng->GetInlet());
node->setDoubleValue("oil-pressure-psi", eng->getOilPressure_psi());
node->setDoubleValue("n1", eng->GetN1());
//node->setDoubleValue("n2", eng->GetN2());
node->setDoubleValue("itt_degf", 32 + eng->GetITT()*9/5);
- node->setBoolValue("ignition", eng->GetIgnition());
+ node->setBoolValue("ignition", eng->GetIgnition() != 0);
node->setDoubleValue("nozzle-pos-norm", eng->GetNozzle());
node->setDoubleValue("inlet-pos-norm", eng->GetInlet());
node->setDoubleValue("oil-pressure-psi", eng->getOilPressure_psi());
node->setBoolValue("cutoff", eng->GetCutoff());
node->setBoolValue("starting", eng->GetEngStarting());
node->setBoolValue("generator-power", eng->GetGeneratorPower());
- node->setBoolValue("damaged", eng->GetCondition());
+ node->setBoolValue("damaged", eng->GetCondition() != 0);
node->setBoolValue("ielu-intervent", eng->GetIeluIntervent());
node->setDoubleValue("oil-temperature-degf", eng->getOilTemp_degF());
// node->setBoolValue("onfire", eng->GetFire());
switch (thruster->GetType()) {
case FGThruster::ttNozzle:
{ // FGNozzle code block
- FGNozzle* noz = (FGNozzle*)thruster;
+// FGNozzle* noz = (FGNozzle*)thruster;
} // end FGNozzle code block
break;
case FGThruster::ttPropeller:
break;
case FGThruster::ttRotor:
{ // FGRotor code block
- FGRotor* rotor = (FGRotor*)thruster;
+// FGRotor* rotor = (FGRotor*)thruster;
} // end FGRotor code block
break;
case FGThruster::ttDirect:
globals->get_controls()->set_elevator_trim(FCS->GetPitchTrimCmd());
globals->get_controls()->set_elevator(FCS->GetDeCmd());
- globals->get_controls()->set_throttle(FGControls::ALL_ENGINES,
- FCS->GetThrottleCmd(0));
+ for( unsigned i = 0; i < Propulsion->GetNumEngines(); i++ )
+ globals->get_controls()->set_throttle(i, FCS->GetThrottleCmd(i));
globals->get_controls()->set_aileron(FCS->GetDaCmd());
globals->get_controls()->set_rudder( FCS->GetDrCmd());