Changeset 284 for trunk/src/game/Creature.cpp

Timestamp:

11/22/08 01:55:20 (17 years ago)

Author:

yumileroy

Message:

Merge with 284 (54b0e67d97fe).

Original author: megamage
Date: 2008-11-21 19:49:54-06:00

Files:

• trunk/src/game/Creature.cpp (modified) (2 diffs)

trunk/src/game/Creature.cpp

@@ -148 +148 @@
     i_AI = NULL;
 
-    DeletePossessedAI();
+    if (i_AI_possessed)
+    {
+        delete i_AI_possessed;
+        i_AI_possessed = NULL;
+    }
 }
 
@@ -563 +567 @@
 }
 
-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