Changeset 1772

Timestamp:

Sep 11, 2008, 6:39:56 PM (16 years ago)

Author:

scheusso

Message:

fixed a bug in spaceship ai(segfault when client disconnects && client was target of spaceshipAI)

Location:

code/trunk/src/orxonox/objects

Files:

• SpaceShip.cc (modified) (2 diffs)
• SpaceShipAI.cc (modified) (2 diffs)
• SpaceShipAI.h (modified) (1 diff)

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -53 +53 @@
 #include "ParticleProjectile.h"
 #include "GraphicsEngine.h"
+#include "SpaceShipAI.h"
 
 namespace orxonox
@@ -145 +146 @@
     SpaceShip::~SpaceShip()
     {
+        for (ObjectList<SpaceShipAI>::iterator it = ObjectList<SpaceShipAI>::begin(); it; ++it)
+            it->shipDied(this);
+      
         if (this->isInitialized())
         {

code/trunk/src/orxonox/objects/SpaceShipAI.cc

@@ -73 +73 @@
     SpaceShipAI::~SpaceShipAI()
     {
-        for (ObjectList<SpaceShipAI>::iterator it = ObjectList<SpaceShipAI>::begin(); it; ++it)
-            it->shipDied(this);
     }
 
@@ -315 +313 @@
     }
 
-    void SpaceShipAI::shipDied(SpaceShipAI* ship)
+    void SpaceShipAI::shipDied(SpaceShip* ship)
     {
         if (ship == this->target_)

code/trunk/src/orxonox/objects/SpaceShipAI.h

@@ -50 +50 @@
             static void createEnemy(int num);
             static void killEnemies(int num);
-            void shipDied(SpaceShipAI* ship);
+            void shipDied(SpaceShip* ship);
             void damage(float damage);
             void kill();