Changeset 120

Timestamp:

11/19/08 13:38:01 (17 years ago)

Author:

yumileroy

Message:

[svn] * Allow WorldObjects? to keep the grid active, and prevent it from being unloaded. This can be done through calling WorldObject::setActive(bool) from the scripting library. Note that entire instances are still unloaded if no player is present on that map to save resources. This behavior can be changed if the need arises.

Original author: w12x
Date: 2008-10-27 08:41:55-05:00

Location:

trunk/src/game

Files:

• DynamicObject.cpp (modified) (2 diffs)
• GameObject.cpp (modified) (2 diffs)
• GridStates.cpp (modified) (1 diff)
• Map.cpp (modified) (1 diff)
• Object.cpp (modified) (1 diff)
• Object.h (modified) (3 diffs)
• ObjectAccessor.cpp (modified) (5 diffs)
• ObjectAccessor.h (modified) (3 diffs)
• Pet.cpp (modified) (1 diff)
• Pet.h (modified) (1 diff)
• Player.cpp (modified) (1 diff)
• Player.h (modified) (1 diff)
• Unit.cpp (modified) (2 diffs)

trunk/src/game/DynamicObject.cpp

@@ -48 +48 @@
     ///- Register the dynamicObject for guid lookup
     if(!IsInWorld()) ObjectAccessor::Instance().AddObject(this);
-    Object::AddToWorld();
+    WorldObject::AddToWorld();
 }
 
@@ -55 +55 @@
     ///- Remove the dynamicObject from the accessor
     if(IsInWorld()) ObjectAccessor::Instance().RemoveObject(this);
-    Object::RemoveFromWorld();
+    WorldObject::RemoveFromWorld();
 }
 

trunk/src/game/GameObject.cpp

@@ -83 +83 @@
     ///- Register the gameobject for guid lookup
     if(!IsInWorld()) ObjectAccessor::Instance().AddObject(this);
-    Object::AddToWorld();
+    WorldObject::AddToWorld();
 }
 
@@ -90 +90 @@
     ///- Remove the gameobject from the accessor
     if(IsInWorld()) ObjectAccessor::Instance().RemoveObject(this);
-    Object::RemoveFromWorld();
+    WorldObject::RemoveFromWorld();
 }
 

trunk/src/game/GridStates.cpp

@@ -37 +37 @@
     if( info.getTimeTracker().Passed() )
     {
-        if( grid.ActiveObjectsInGrid() == 0 && !ObjectAccessor::Instance().PlayersNearGrid(x, y, m.GetId(), m.GetInstanceId()) )
+        if( grid.ActiveObjectsInGrid() == 0 && !ObjectAccessor::Instance().ActiveObjectsNearGrid(x, y, m.GetId(), m.GetInstanceId()) )
         {
             ObjectGridStoper stoper(grid);

trunk/src/game/Map.cpp

@@ -879 +879 @@
 
     {
-        if(!pForce && ObjectAccessor::Instance().PlayersNearGrid(x, y, i_id, i_InstanceId) )
+        if(!pForce && ObjectAccessor::Instance().ActiveObjectsNearGrid(x, y, i_id, i_InstanceId) )
             return false;
 

trunk/src/game/Object.cpp

@@ -975 +975 @@
 
     mSemaphoreTeleport  = false;
+
+    m_isActive          = false;
+}
+
+WorldObject::~WorldObject()
+{
+    if(m_isActive && IsInWorld())
+        ObjectAccessor::Instance().RemoveActiveObject(this);
+}
+
+void WorldObject::setActive(bool isActive)
+{
+    // if already in the same activity state as we try to set, do nothing
+    if(isActive == m_isActive)
+        return;
+    m_isActive = isActive;
+    if(IsInWorld())
+    {
+        if(isActive)
+            ObjectAccessor::Instance().AddActiveObject(this);
+        else
+            ObjectAccessor::Instance().RemoveActiveObject(this);
+    }
+}
+
+void WorldObject::AddToWorld()
+{
+    Object::AddToWorld();
+    if(m_isActive)
+        ObjectAccessor::Instance().AddActiveObject(this);
+}
+
+void WorldObject::RemoveFromWorld()
+{
+    if(m_isActive)
+        ObjectAccessor::Instance().RemoveActiveObject(this);
+    Object::RemoveFromWorld();
 }
 

trunk/src/game/Object.h

@@ -28 +28 @@
 #include "GameSystem/GridReference.h"
 #include "ObjectDefines.h"
+#include "GridDefines.h"
 
 #include <set>
@@ -324 +325 @@
 {
     public:
-        virtual ~WorldObject ( ) {}
+        virtual ~WorldObject ( );
+
+        virtual void AddToWorld();
+
+        virtual void RemoveFromWorld();
 
         virtual void Update ( uint32 /*time_diff*/ ) { }
@@ -449 +454 @@
         Creature* SummonCreature(uint32 id, float x, float y, float z, float ang,TempSummonType spwtype,uint32 despwtime);
         GameObject* SummonGameObject(uint32 entry, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 respawnTime);
+        bool isActive() const { return m_isActive; }
+        virtual void setActive(bool isActive);
     protected:
         explicit WorldObject();
         std::string m_name;
+        bool m_isActive;
 
     private:

trunk/src/game/ObjectAccessor.cpp

@@ -506 +506 @@
 
 void
+ObjectAccessor::AddActiveObject( WorldObject * obj )
+{
+    i_activeobjects.insert(obj);
+}
+
+void
+ObjectAccessor::RemoveActiveObject( WorldObject * obj )
+{
+    i_activeobjects.erase(obj);
+}
+
+void
 ObjectAccessor::Update(uint32 diff)
 {
     {
-        typedef std::multimap<uint32, Player *> CreatureLocationHolderType;
-        CreatureLocationHolderType creature_locations;
-        //TODO: Player guard
+        // player update might remove the player from grid, and that causes crashes. We HAVE to update players first, and then the active objects.
         HashMapHolder<Player>::MapType& playerMap = HashMapHolder<Player>::GetContainer();
         for(HashMapHolder<Player>::MapType::iterator iter = playerMap.begin(); iter != playerMap.end(); ++iter)
@@ -518 +528 @@
             {
                 iter->second->Update(diff);
-                creature_locations.insert( CreatureLocationHolderType::value_type(iter->second->GetMapId(), iter->second) );
             }
+        }
+
+        // clone the active object list, because update might remove from it
+        std::set<WorldObject *> activeobjects(i_activeobjects);
+
+        std::set<WorldObject *>::const_iterator itr;
+        for(itr = activeobjects.begin(); itr != activeobjects.end(); ++itr)
+        {
+            (*itr)->GetMap()->resetMarkedCells();
         }
 
@@ -530 +548 @@
         TypeContainerVisitor<Trinity::ObjectUpdater, WorldTypeMapContainer > world_object_update(updater);
 
-        for(CreatureLocationHolderType::iterator iter=creature_locations.begin(); iter != creature_locations.end(); ++iter)
-        {
-            MapManager::Instance().GetMap((*iter).first, (*iter).second)->resetMarkedCells();
-        }
-
-        for(CreatureLocationHolderType::iterator iter=creature_locations.begin(); iter != creature_locations.end(); ++iter)
-        {
-            Player *player = (*iter).second;
-            map = MapManager::Instance().GetMap((*iter).first, player);
-
-            CellPair standing_cell(Trinity::ComputeCellPair(player->GetPositionX(), player->GetPositionY()));
+        for(itr = activeobjects.begin(); itr != activeobjects.end(); ++itr)
+        {
+            WorldObject *obj = (*itr);
+            map = obj->GetMap();
+
+            CellPair standing_cell(Trinity::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY()));
 
             // Check for correctness of standing_cell, it also avoids problems with update_cell
@@ -577 +590 @@
 
 bool
-ObjectAccessor::PlayersNearGrid(uint32 x, uint32 y, uint32 m_id, uint32 i_id) const
+ObjectAccessor::ActiveObjectsNearGrid(uint32 x, uint32 y, uint32 m_id, uint32 i_id) const
 {
     CellPair cell_min(x*MAX_NUMBER_OF_CELLS, y*MAX_NUMBER_OF_CELLS);
@@ -586 +599 @@
     cell_max += 2;
 
-    //TODO: Guard player
-    HashMapHolder<Player>::MapType& playerMap = HashMapHolder<Player>::GetContainer();
-    for(HashMapHolder<Player>::MapType::const_iterator iter=playerMap.begin(); iter != playerMap.end(); ++iter)
-    {
-        if( m_id != iter->second->GetMapId() || i_id != iter->second->GetInstanceId() )
+    for(std::set<WorldObject*>::const_iterator itr = i_activeobjects.begin(); itr != i_activeobjects.end(); ++itr)
+    {
+        if( m_id != (*itr)->GetMapId() || i_id != (*itr)->GetInstanceId() )
             continue;
 
-        CellPair p = Trinity::ComputeCellPair(iter->second->GetPositionX(), iter->second->GetPositionY());
+        CellPair p = Trinity::ComputeCellPair((*itr)->GetPositionX(), (*itr)->GetPositionY());
         if( (cell_min.x_coord <= p.x_coord && p.x_coord <= cell_max.x_coord) &&
             (cell_min.y_coord <= p.y_coord && p.y_coord <= cell_max.y_coord) )
             return true;
+
     }
 

trunk/src/game/ObjectAccessor.h

@@ -194 +194 @@
         Corpse* ConvertCorpseForPlayer(uint64 player_guid);
 
-        bool PlayersNearGrid(uint32 x,uint32 y,uint32 m_id,uint32 i_id) const;
+        bool ActiveObjectsNearGrid(uint32 x,uint32 y,uint32 m_id,uint32 i_id) const;
 
         static void UpdateObject(Object* obj, Player* exceptPlayer);
@@ -201 +201 @@
         static void UpdateObjectVisibility(WorldObject* obj);
         static void UpdateVisibilityForPlayer(Player* player);
+
+        void AddActiveObject(WorldObject*);
+        void RemoveActiveObject(WorldObject*);
     private:
         struct WorldObjectChangeAccumulator
@@ -221 +224 @@
         void _update(void);
         std::set<Object *> i_objects;
+        std::set<WorldObject *> i_activeobjects;
         LockType i_playerGuard;
         LockType i_updateGuard;

trunk/src/game/Pet.cpp

@@ -97 +97 @@
     m_autospells.clear();
     m_declinedname = NULL;
+    m_isActive = true;
 }
 

trunk/src/game/Pet.h

@@ -123 +123 @@
         void AddToWorld();
         void RemoveFromWorld();
+        // always active
+        void setActive() {}
 
         PetType getPetType() const { return m_petType; }

trunk/src/game/Player.cpp

@@ -426 +426 @@
 
     m_declinedname = NULL;
+
+    m_isActive = true;
 }
 

trunk/src/game/Player.h

@@ -903 +903 @@
         void AddToWorld();
         void RemoveFromWorld();
+        // always active
+        void setActive() {}
 
         bool TeleportTo(uint32 mapid, float x, float y, float z, float orientation, uint32 options = 0);

trunk/src/game/Unit.cpp

@@ -9827 +9827 @@
 void Unit::AddToWorld()
 {
-    Object::AddToWorld();
+    WorldObject::AddToWorld();
 }
 
@@ -9838 +9838 @@
     }
 
-    Object::RemoveFromWorld();
+    WorldObject::RemoveFromWorld();
 }