Replace the data/Airports/basic.dat.gz and data/Airports/runways.dat.gz with

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

diff --git a/src/AIModel/AIManager.cxx b/src/AIModel/AIManager.cxx
index 04919f7d347bec792af38f6d09e82fe51f7549ad..25f5425c7793cc5e0e9e9370084f7681e6c8bb6a 100644 (file)
--- a/src/AIModel/AIManager.cxx
+++ b/src/AIModel/AIManager.cxx
@@ -22,6 +22,11 @@
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
 
+#include <Airports/simple.hxx>
+#include <Traffic/SchedFlight.hxx>
+#include <Traffic/Schedule.hxx>
+#include <Traffic/TrafficMgr.hxx>
+
 #include <list>
 
 #include "AIManager.hxx"
@@ -53,6 +58,11 @@ FGAIManager::~FGAIManager() {
       ++ai_list_itr;
     }
   ai_list.clear();
+  ModelVecIterator i = loadedModels.begin();
+  while (i != loadedModels.end())
+    {
+      i->getModelId()->deRef();
+    }
 }
 
 
@@ -88,6 +98,7 @@ void FGAIManager::update(double dt) {
         // initialize these for finding nearest thermals
         range_nearest = 10000.0;
         strength = 0.0;
+       FGTrafficManager *tmgr = (FGTrafficManager*) globals->get_subsystem("Traffic Manager");
 
         if (!enabled)
             return;
@@ -97,6 +108,7 @@ void FGAIManager::update(double dt) {
         ai_list_itr = ai_list.begin();
         while(ai_list_itr != ai_list.end()) {
                 if ((*ai_list_itr)->getDie()) {      
+                 tmgr->release((*ai_list_itr)->getID());
                    --numObjects[(*ai_list_itr)->getType()];
                    --numObjects[0];
                    (*ai_list_itr)->unbind();
@@ -124,9 +136,9 @@ void FGAIManager::update(double dt) {
 
 
 void*
-FGAIManager::createAircraft( FGAIModelEntity *entity ) {
+FGAIManager::createAircraft( FGAIModelEntity *entity,   FGAISchedule *ref) {
      
-        FGAIAircraft* ai_plane = new FGAIAircraft(this);
+        FGAIAircraft* ai_plane = new FGAIAircraft(this, ref);
         ai_list.push_back(ai_plane);
         ++numObjects[0];
         ++numObjects[FGAIBase::otAircraft];
@@ -164,7 +176,7 @@ FGAIManager::createAircraft( FGAIModelEntity *entity ) {
 void*
 FGAIManager::createShip( FGAIModelEntity *entity ) {
     
-     //cout << "creating ship" << endl;    
+     // cout << "creating ship" << endl;    
 
         FGAIShip* ai_ship = new FGAIShip(this);
         ai_list.push_back(ai_ship);
@@ -190,7 +202,7 @@ FGAIManager::createShip( FGAIModelEntity *entity ) {
 void*
 FGAIManager::createCarrier( FGAIModelEntity *entity ) {
     
-    //cout << "creating carrier" << endl;
+    // cout << "creating carrier" << endl;
 
         FGAICarrier* ai_carrier = new FGAICarrier(this);
         ai_list.push_back(ai_carrier);
@@ -207,6 +219,9 @@ FGAIManager::createCarrier( FGAIModelEntity *entity ) {
         ai_carrier->setWireObjects(entity->wire_objects);
         ai_carrier->setCatapultObjects(entity->catapult_objects);
         ai_carrier->setRadius(entity->radius);
+        ai_carrier->setXoffset(entity->x_offset);
+        ai_carrier->setYoffset(entity->y_offset);
+        ai_carrier->setZoffset(entity->z_offset);
 
         if ( entity->fp ) {
            ai_carrier->setFlightPlan(entity->fp);
@@ -352,4 +367,25 @@ void FGAIManager::processScenario( string &filename ) {
   delete s;
 }
 
+// This code keeps track of models that have already been loaded
+// Eventually we'd prbably need to find a way to keep track of models
+// that are unloaded again
+ssgBranch * FGAIManager::getModel(const string& path)
+{
+  ModelVecIterator i = loadedModels.begin();
+  while (i != loadedModels.end())
+    {
+      if (i->getPath() == path)
+       return i->getModelId();
+      i++;
+    }
+  return 0;
+}
+
+void FGAIManager::setModel(const string& path, ssgBranch *model)
+{
+  loadedModels.push_back(FGModelID(path,model));
+}
+
+
 //end AIManager.cxx