araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-16 04:59:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/Objects: Rename Object::m_isWorldObject and related functions to avoid conflicting with "WorldObject" class name

Browse Source 
(cherry picked from commit 9402c66e84)
This commit is contained in:
Shauren
2024-03-14 11:01:58 +01:00
parent f46f617c33
commit b64e261e94
6 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/server/game/Entities/Object/Object.cpp
View File

@@ -76,21 +76,6 @@ Object::Object() : m_scriptRef(this, NoopObjectDeleter())
m_objectUpdated = false;
}
WorldObject::~WorldObject()
{
// this may happen because there are many !create/delete
if (IsWorldObject() && m_currMap)
{
if (GetTypeId() == TYPEID_CORPSE)
{
TC_LOG_FATAL("misc", "WorldObject::~WorldObject Corpse Type: {} ({}) deleted but still in map!!",
ToCorpse()->GetType(), GetGUID().ToString());
ABORT();
}
ResetMap();
}
}
Object::~Object()
{
if (IsInWorld())
@@ -973,7 +958,7 @@ void MovementInfo::OutDebug()
}
WorldObject::WorldObject(bool isWorldObject) : Object(), WorldLocation(), LastUsedScriptID(0),
m_movementInfo(), m_name(), m_isActive(false), m_isFarVisible(false), m_isWorldObject(isWorldObject), m_zoneScript(nullptr),
m_movementInfo(), m_name(), m_isActive(false), m_isFarVisible(false), m_isStoredInWorldObjectGridContainer(isWorldObject), m_zoneScript(nullptr),
m_transport(nullptr), m_zoneId(0), m_areaId(0), m_staticFloorZ(VMAP_INVALID_HEIGHT), m_outdoors(false), m_liquidStatus(LIQUID_MAP_NO_WATER),
m_currMap(nullptr), m_InstanceId(0), m_phaseMask(PHASEMASK_NORMAL), m_notifyflags(0)
{
@@ -981,7 +966,22 @@ m_currMap(nullptr), m_InstanceId(0), m_phaseMask(PHASEMASK_NORMAL), m_notifyflag
m_serverSideVisibilityDetect.SetValue(SERVERSIDE_VISIBILITY_GHOST, GHOST_VISIBILITY_ALIVE);
}
void WorldObject::SetWorldObject(bool on)
WorldObject::~WorldObject()
{
// this may happen because there are many !create/delete
if (IsStoredInWorldObjectGridContainer() && m_currMap)
{
if (GetTypeId() == TYPEID_CORPSE)
{
TC_LOG_FATAL("misc", "WorldObject::~WorldObject Corpse Type: {} ({}) deleted but still in map!!",
ToCorpse()->GetType(), GetGUID().ToString());
ABORT();
}
ResetMap();
}
}
void WorldObject::SetIsStoredInWorldObjectGridContainer(bool on)
{
if (!IsInWorld())
return;
@@ -989,9 +989,9 @@ void WorldObject::SetWorldObject(bool on)
GetMap()->AddObjectToSwitchList(this, on);
}
bool WorldObject::IsWorldObject() const
bool WorldObject::IsStoredInWorldObjectGridContainer() const
{
if (m_isWorldObject)
if (m_isStoredInWorldObjectGridContainer)
return true;
if (ToCreature() && ToCreature()->m_isTempWorldObject)
@@ -1826,7 +1826,7 @@ void WorldObject::SetMap(Map* map)
m_currMap = map;
m_mapId = map->GetId();
m_InstanceId = map->GetInstanceId();
if (IsWorldObject())
if (IsStoredInWorldObjectGridContainer())
m_currMap->AddWorldObject(this);
}
@@ -1834,7 +1834,7 @@ void WorldObject::ResetMap()
{
ASSERT(m_currMap);
ASSERT(!IsInWorld());
if (IsWorldObject())
if (IsStoredInWorldObjectGridContainer())
m_currMap->RemoveWorldObject(this);
m_currMap = nullptr;
//maybe not for corpse