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

Timestamp:

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

Author:

yumileroy

Message:

*Alterac Valley. By Bogie and Balrok. Note: some core contents are modified. Will fix them later. Some sql are disabled because of possible conflict with offical DB. Use them at your own risk.

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

Files:

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

trunk/src/game/Creature.cpp

@@ -148 +148 @@
     i_AI = NULL;
 
-    if (i_AI_possessed)
-    {
-        delete i_AI_possessed;
-        i_AI_possessed = NULL;
-    }
+    DeletePossessedAI();
 }
 
@@ -567 +563 @@
 }
 
-void Creature::DisablePossessedAI()
+void Creature::DeletePossessedAI()
 {
     if (!i_AI_possessed) return;
+
+    delete i_AI_possessed;
+    i_AI_possessed = NULL;
 
     // Signal the old AI that it's been re-enabled
@@ -579 +578 @@
     SetMapId(map->GetId());
     SetInstanceId(map->GetInstanceId());
+    m_DBTableGuid = guidlow;
 
     //oX = x;     oY = y;    dX = x;    dY = y;    m_moveTime = 0;    m_startMove = 0;
@@ -605 +605 @@
         LoadCreaturesAddon();
     }
-
     return bResult;
 }