Changeset 272 for trunk/src/game/Object.cpp

Timestamp:

11/22/08 00:35:41 (17 years ago)

Author:

yumileroy

Message:

Delete possessed AI only on creature delete.

Original author: gvcoman
Date: 2008-11-16 14:38:02-05:00

Files:

• trunk/src/game/Object.cpp (modified) (3 diffs)

trunk/src/game/Object.cpp

@@ -991 +991 @@
 WorldObject::~WorldObject()
 {
-    if(m_isActive && !isType(TYPEMASK_PLAYER) && IsInWorld())
-        GetMap()->RemoveActiveObject(this);
+    if(m_isActive && IsInWorld())
+        ObjectAccessor::Instance().RemoveActiveObject(this);
 }
 
@@ -998 +998 @@
 {
     // if already in the same activity state as we try to set, do nothing
-    if(isActive == m_isActive || isType(TYPEMASK_PLAYER))
+    if(isActive == m_isActive)
         return;
-
     m_isActive = isActive;
     if(IsInWorld())
     {
         if(isActive)
-            GetMap()->AddActiveObject(this);
+            ObjectAccessor::Instance().AddActiveObject(this);
         else
-            GetMap()->RemoveActiveObject(this);
+            ObjectAccessor::Instance().RemoveActiveObject(this);
     }
 }
@@ -1014 +1013 @@
 {
     Object::AddToWorld();
-    if(m_isActive && !isType(TYPEMASK_PLAYER))
-        GetMap()->AddActiveObject(this);
+    if(m_isActive)
+        ObjectAccessor::Instance().AddActiveObject(this);
 }
 
 void WorldObject::RemoveFromWorld()
 {
-    if(m_isActive && !isType(TYPEMASK_PLAYER))
-        GetMap()->RemoveActiveObject(this);
+    if(m_isActive)
+        ObjectAccessor::Instance().RemoveActiveObject(this);
     Object::RemoveFromWorld();
 }