Fix a small number of potential problems.

diff --git a/src/AIModel/AIBase.cxx b/src/AIModel/AIBase.cxx
index 9757c5d545f4ebc73fc87074c83809ab1301d9e5..57a6ed5a322ffed8ee028fc5862082e06eb26eef 100644 (file)
--- a/src/AIModel/AIBase.cxx
+++ b/src/AIModel/AIBase.cxx
@@ -43,7 +43,12 @@
 #include "AIBase.hxx"
 #include "AIManager.hxx"
 
-FGAIBase::FGAIBase() {
+FGAIBase::FGAIBase()
+ :  fp( NULL ),
+    model( NULL ),
+    props( NULL ),
+    manager( NULL )
+{
     _type_str = "model";
     tgt_roll = roll = tgt_pitch = tgt_yaw = tgt_vs = vs = pitch = 0.0;
     bearing = elevation = range = rdot = 0.0;
@@ -53,12 +58,9 @@ FGAIBase::FGAIBase() {
     no_roll = true;
     life = 900;
     model_path = "";
-    model = 0;
     _otype = otNull;
     index = 0;
-    fp = (FGAIFlightPlan*)0;
     delete_me = false;
-    manager = NULL;
 }
 
 FGAIBase::~FGAIBase() {
@@ -67,6 +69,7 @@ FGAIBase::~FGAIBase() {
     SGPropertyNode *root = globals->get_props()->getNode("ai/models", true);
     root->removeChild(_type_str.c_str(), index);
     if (fp) delete fp;
+    fp = NULL;
 }
 
 void FGAIBase::update(double dt) {

diff --git a/src/AIModel/AIManager.cxx b/src/AIModel/AIManager.cxx
index c5a34bdeb84c498e70978d76e60f94ce7d713ae4..722da5aaa7cba556c65925097d186813b4a9ad75 100644 (file)
--- a/src/AIModel/AIManager.cxx
+++ b/src/AIModel/AIManager.cxx
@@ -199,10 +199,10 @@ FGAIManager::createBallistic( FGAIModelEntity *entity ) {
         ai_ballistic->setDragArea(entity->eda);
         ai_ballistic->setLife(entity->life);
         ai_ballistic->setBuoyancy(entity->buoyancy);
-           ai_ballistic->setWind_from_east(entity->wind_from_east);
-           ai_ballistic->setWind_from_north(entity->wind_from_north);
-           ai_ballistic->setWind(entity->wind);
-               ai_ballistic->setRoll(entity->roll);
+        ai_ballistic->setWind_from_east(entity->wind_from_east);
+        ai_ballistic->setWind_from_north(entity->wind_from_north);
+        ai_ballistic->setWind(entity->wind);
+        ai_ballistic->setRoll(entity->roll);
         ai_ballistic->init();
         ai_ballistic->bind();
         return ai_ballistic;

diff --git a/src/AIModel/AIScenario.cxx b/src/AIModel/AIScenario.cxx
index 4ad91d66b183e3fd46394a81d3bf773e536d6d23..9bc0fa7b82cf1ab5c358090158a55ed181df3173 100644 (file)
--- a/src/AIModel/AIScenario.cxx
+++ b/src/AIModel/AIScenario.cxx
@@ -74,10 +74,11 @@ FGAIScenario::FGAIScenario(string filename)
      en->diameter       = entry_node->getDoubleValue("diameter-ft", 0.0);
      en->eda            = entry_node->getDoubleValue("eda", 0.007);
      en->life           = entry_node->getDoubleValue("life", 900.0);
-        en->buoyancy       = entry_node->getDoubleValue("buoyancy", 0);
-        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->buoyancy       = entry_node->getDoubleValue("buoyancy", 0);
+     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->fp             = NULL;
    }
 
   entry_iterator = entries.begin();