Set the format default to float instead of int.

[flightgear.git] / src / AIModel / AIScenario.cxx

diff --git a/src/AIModel/AIScenario.cxx b/src/AIModel/AIScenario.cxx
index 2802a815223b0638f77e74b4f81fa7a02db3c456..9742db92c340f2d4dea1bea9a4e676f3cef45ca8 100644 (file)
--- a/src/AIModel/AIScenario.cxx
+++ b/src/AIModel/AIScenario.cxx
@@ -30,10 +30,11 @@
 #include <Main/fg_props.hxx>
 
 #include "AIScenario.hxx"
+#include "AIFlightPlan.hxx"
 
 
 
-FGAIScenario::FGAIScenario(string filename)
+FGAIScenario::FGAIScenario(string &filename)
 {
   int i;
   SGPath path( globals->get_fg_root() );
@@ -49,12 +50,13 @@ FGAIScenario::FGAIScenario(string filename)
       return;
   }
 
+  entries.clear();
   SGPropertyNode * node = root.getNode("scenario");
   for (i = 0; i < node->nChildren(); i++) { 
      //cout << "Reading entry " << i << endl;        
-     FGAIModelEntity* en = new FGAIModelEntity;
-     entries.push_back( en );
      SGPropertyNode * entry_node = node->getChild(i);
+
+     FGAIModelEntity* en = new FGAIModelEntity;
      en->callsign       = entry_node->getStringValue("callsign", "none");
      en->m_type         = entry_node->getStringValue("type", "aircraft");
      en->m_class        = entry_node->getStringValue("class", "jet_transport");
@@ -78,9 +80,15 @@ FGAIScenario::FGAIScenario(string filename)
      en->wind_from_east = entry_node->getDoubleValue("wind_from_east", 0);
      en->wind_from_north = entry_node->getDoubleValue("wind_from_north", 0);
      en->wind            = entry_node->getBoolValue("wind", false);
-        en->cd              = entry_node->getDoubleValue  ("cd", 0.029); 
-        en->weight          = entry_node->getDoubleValue  ("weight", 0.030); 
+     en->cd              = entry_node->getDoubleValue  ("cd", 0.029); 
+     en->mass            = entry_node->getDoubleValue  ("mass", 0.007); 
+
+
      en->fp             = NULL;
+     if (en->flightplan != ""){
+        en->fp = new FGAIFlightPlan( en->flightplan );
+     }
+     entries.push_back( en );
    }
 
   entry_iterator = entries.begin();
@@ -111,3 +119,4 @@ int FGAIScenario::nEntries( void )
 }
 
 // end scenario.cxx
+