Merge with 284 (54b0e67d97fe).

--HG--
branch : trunk

1 files changed, 6 insertions, 5 deletions

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 24b4f4e141b..b2b6639148e 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -147,7 +147,11 @@ Creature::~Creature()
     delete i_AI;
     i_AI = NULL;
 
-    DeletePossessedAI();
+    if (i_AI_possessed)
+    {
+        delete i_AI_possessed;
+        i_AI_possessed = NULL;
+    }
 }
 
 void Creature::AddToWorld()
@@ -562,13 +566,10 @@ void Creature::InitPossessedAI()
     i_AI->OnPossess(true);
 }
 
-void Creature::DeletePossessedAI()
+void Creature::DisablePossessedAI()
 {
     if (!i_AI_possessed) return;
 
-    delete i_AI_possessed;
-    i_AI_possessed = NULL;
-
     // Signal the old AI that it's been re-enabled
     i_AI->OnPossess(false);
 }