Changeset 10513 in orxonox.OLD for trunk/src

Timestamp:

Jan 30, 2007, 8:12:15 PM (18 years ago)

Author:

patrick

Message:

ai segfault fixed

Location:

trunk/src

Files:

• ai/ai_engine.h (modified) (1 diff)
• story_entities/game_world_data.cc (modified) (4 diffs)
• world_entities/mount_point.cc (modified) (1 diff)

trunk/src/ai/ai_engine.h

@@ -7 +7 @@
 
 
-class AIEngine{
- public:
-        ~AIEngine(){}
+class AIEngine
+{
+public:
+  ~AIEngine() { singletonRef = NULL; }
 
-   static AIEngine* getInstance() { if( singletonRef == NULL) singletonRef = new AIEngine(); return singletonRef; }
+  static AIEngine* getInstance() { if( singletonRef == NULL) singletonRef = new AIEngine(); return singletonRef; }
 
-   void tick(float dt);
-        void addAI(int teamNumber, int swarmNumber, WorldEntity* npc, float maxSpeed, float attackDistance);
-        void removeAI(int teamNumber, int swarmNumber, WorldEntity* npc);
+  void tick(float dt);
+  void addAI(int teamNumber, int swarmNumber, WorldEntity* npc, float maxSpeed, float attackDistance);
+  void removeAI(int teamNumber, int swarmNumber, WorldEntity* npc);
 
- private:
-        AIEngine(){}
-        static AIEngine* singletonRef;
-        std::map<int,AITeam*> teams;
+private:
+  AIEngine()
+{}
+  static AIEngine* singletonRef;
+  std::map<int,AITeam*> teams;
 };
 

trunk/src/story_entities/game_world_data.cc

@@ -52 +52 @@
 #include "network_manager.h"
 #include "physics_engine.h"
+#include "ai_engine.h"
 
 #include "glmenu_imagescreen.h"
@@ -105 +106 @@
   //State::setCameraman(camMan);
   LightManager::getInstance();
+  AIEngine::getInstance();
 
 //  GraphicsEngine::getInstance()->displayFPS(true);
@@ -130 +132 @@
     this->setName(string.c_str());
 
+
   this->loadGUI(root);
   this->loadWorldEntities(root);
@@ -148 +151 @@
   this->unloadScene();
   this->unloadCameras();
+
+  // killl ai engine
+  delete AIEngine::getInstance();
 
   return ErrorMessage();

trunk/src/world_entities/mount_point.cc

@@ -168 +168 @@
     if( obj->isA( WorldEntity::staticClassID()))
     {
+      PRINTF(0)("Mount Point created a %s\n", obj->getCName());
       // cast down the object to WE
       this->_mount = dynamic_cast<WorldEntity*>(obj);