diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-03-14 11:01:58 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2024-03-14 20:49:49 +0100 |
| commit | b64e261e942e093be906e0591c8b4232706ee0e7 (patch) | |
| tree | fc24f91f749a41031cfc1a6d9543c42436ec3d2c /src/server/game/Maps/Map.cpp | |
| parent | f46f617c33090b22239ff73574f65df2e2a3f58f (diff) | |
Core/Objects: Rename Object::m_isWorldObject and related functions to avoid conflicting with "WorldObject" class name
(cherry picked from commit 9402c66e8423243d13dbc19e8713e298bea0ac7b)
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index e58d4e17a5d..ded02362b1c 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -97,7 +97,7 @@ Map::~Map() while (!i_worldObjects.empty()) { WorldObject* obj = *i_worldObjects.begin(); - ASSERT(obj->IsWorldObject()); + ASSERT(obj->IsStoredInWorldObjectGridContainer()); //ASSERT(obj->GetTypeId() == TYPEID_CORPSE); obj->RemoveFromWorld(); obj->ResetMap(); @@ -316,7 +316,7 @@ template<class T> void Map::AddToGrid(T* obj, Cell const& cell) { NGridType* grid = getNGrid(cell.GridX(), cell.GridY()); - if (obj->IsWorldObject()) + if (obj->IsStoredInWorldObjectGridContainer()) grid->GetGridType(cell.CellX(), cell.CellY()).template AddWorldObject<T>(obj); else grid->GetGridType(cell.CellX(), cell.CellY()).template AddGridObject<T>(obj); @@ -326,7 +326,7 @@ template<> void Map::AddToGrid(Creature* obj, Cell const& cell) { NGridType* grid = getNGrid(cell.GridX(), cell.GridY()); - if (obj->IsWorldObject()) + if (obj->IsStoredInWorldObjectGridContainer()) grid->GetGridType(cell.CellX(), cell.CellY()).AddWorldObject(obj); else grid->GetGridType(cell.CellX(), cell.CellY()).AddGridObject(obj); @@ -347,7 +347,7 @@ template<> void Map::AddToGrid(DynamicObject* obj, Cell const& cell) { NGridType* grid = getNGrid(cell.GridX(), cell.GridY()); - if (obj->IsWorldObject()) + if (obj->IsStoredInWorldObjectGridContainer()) grid->GetGridType(cell.CellX(), cell.CellY()).AddWorldObject(obj); else grid->GetGridType(cell.CellX(), cell.CellY()).AddGridObject(obj); @@ -367,7 +367,7 @@ void Map::AddToGrid(Corpse* obj, Cell const& cell) // to avoid failing an assertion in GridObject::AddToGrid if (grid->isGridObjectDataLoaded()) { - if (obj->IsWorldObject()) + if (obj->IsStoredInWorldObjectGridContainer()) grid->GetGridType(cell.CellX(), cell.CellY()).AddWorldObject(obj); else grid->GetGridType(cell.CellX(), cell.CellY()).AddGridObject(obj); @@ -380,7 +380,7 @@ void Map::SwitchGridContainers(T* /*obj*/, bool /*on*/) { } template<> void Map::SwitchGridContainers(Creature* obj, bool on) { - ASSERT(!obj->IsPermanentWorldObject()); + ASSERT(!obj->IsAlwaysStoredInWorldObjectGridContainer()); CellCoord p = Trinity::ComputeCellCoord(obj->GetPositionX(), obj->GetPositionY()); if (!p.IsCoordValid()) { @@ -425,7 +425,7 @@ void Map::SwitchGridContainers(Creature* obj, bool on) template<> void Map::SwitchGridContainers(GameObject* obj, bool on) { - ASSERT(!obj->IsPermanentWorldObject()); + ASSERT(!obj->IsAlwaysStoredInWorldObjectGridContainer()); CellCoord p = Trinity::ComputeCellCoord(obj->GetPositionX(), obj->GetPositionY()); if (!p.IsCoordValid()) { @@ -3603,7 +3603,7 @@ void Map::RemoveAllObjectsInRemoveList() bool on = itr->second; i_objectsToSwitch.erase(itr); - if (!obj->IsPermanentWorldObject()) + if (!obj->IsAlwaysStoredInWorldObjectGridContainer()) { switch (obj->GetTypeId()) { |