fly/flightgear
1
0
Fork 0
Code Activity

Use lower case letters instead.

Browse source
This commit is contained in:
ehofman 2004-05-15 12:46:25 +00:00
parent 1dfe93d550
commit c3c61ae657
2 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/AIModel/AIFlightPlan.cxx
View file

@ -46,20 +46,20 @@ FGAIFlightPlan::FGAIFlightPlan(string filename)
return; return;
} }
SGPropertyNode * node = root.getNode("FLIGHTPLAN"); SGPropertyNode * node = root.getNode("flightplan");
for (i = 0; i < node->nChildren(); i++) { for (i = 0; i < node->nChildren(); i++) {
//cout << "Reading waypoint " << i << endl; //cout << "Reading waypoint " << i << endl;
waypoint* wpt = new waypoint; waypoint* wpt = new waypoint;
waypoints.push_back( wpt ); waypoints.push_back( wpt );
SGPropertyNode * wpt_node = node->getChild(i); SGPropertyNode * wpt_node = node->getChild(i);
wpt->name = wpt_node->getStringValue("NAME", "END"); wpt->name = wpt_node->getStringValue("name", "END");
wpt->latitude = wpt_node->getDoubleValue("LAT", 0); wpt->latitude = wpt_node->getDoubleValue("lat", 0);
wpt->longitude = wpt_node->getDoubleValue("LON", 0); wpt->longitude = wpt_node->getDoubleValue("lon", 0);
wpt->altitude = wpt_node->getDoubleValue("ALT", 0); wpt->altitude = wpt_node->getDoubleValue("alt", 0);
wpt->speed = wpt_node->getDoubleValue("KTAS", 0); wpt->speed = wpt_node->getDoubleValue("ktas", 0);
wpt->crossat = wpt_node->getDoubleValue("CROSSAT", -10000); wpt->crossat = wpt_node->getDoubleValue("crossat", -10000);
wpt->gear_down = wpt_node->getBoolValue("GEAR-DOWN", false); wpt->gear_down = wpt_node->getBoolValue("gear-down", false);
wpt->flaps_down= wpt_node->getBoolValue("FLAPS-DOWN", false); wpt->flaps_down= wpt_node->getBoolValue("flaps-down", false);
} }
wpt_iterator = waypoints.begin(); wpt_iterator = waypoints.begin();
@ -163,9 +163,6 @@ double FGAIFlightPlan::getBearing(double lat, double lon, waypoint* wp){
if (!southerly && easterly) return 90.0 - angle; if (!southerly && easterly) return 90.0 - angle;
if (southerly && !easterly) return 270.0 - angle; if (southerly && !easterly) return 270.0 - angle;
if (!southerly && !easterly) return 270.0 + angle; if (!southerly && !easterly) return 270.0 + angle;
/* prevent a compiler warning */
return 0.0;
} }

10
src/AIModel/AIScenario.cxx
View file

@ -46,16 +46,16 @@ FGAIScenario::FGAIScenario(string filename)
return; return;
} }
SGPropertyNode * node = root.getNode("SCENARIO"); SGPropertyNode * node = root.getNode("scenario");
for (i = 0; i < node->nChildren(); i++) { for (i = 0; i < node->nChildren(); i++) {
//cout << "Reading entry " << i << endl; //cout << "Reading entry " << i << endl;
entry* en = new entry; entry* en = new entry;
entries.push_back( en ); entries.push_back( en );
SGPropertyNode * entry_node = node->getChild(i); SGPropertyNode * entry_node = node->getChild(i);
en->callsign = entry_node->getStringValue("CALLSIGN", "none"); en->callsign = entry_node->getStringValue("callsign", "none");
en->aircraft_class = entry_node->getStringValue("CLASS", "jet_transport"); en->aircraft_class = entry_node->getStringValue("class", "jet_transport");
en->model_path = entry_node->getStringValue("MODEL", "Models/Geometry/glider.ac"); en->model_path = entry_node->getStringValue("model", "Models/Geometry/glider.ac");
en->flightplan = entry_node->getStringValue("FLIGHTPLAN", ""); en->flightplan = entry_node->getStringValue("flightplan", "");
} }
entry_iterator = entries.begin(); entry_iterator = entries.begin();