araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-13 11:43:18 -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
This commit is contained in:
Shauren
2024-03-14 11:01:58 +01:00
parent b705283d0e
commit 9402c66e84
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -872,7 +872,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), _dbPhase(0), m_notifyflags(0)
{
@@ -883,7 +883,7 @@ m_currMap(nullptr), m_InstanceId(0), _dbPhase(0), m_notifyflags(0)
WorldObject::~WorldObject()
{
// this may happen because there are many !create/delete
if (IsWorldObject() && m_currMap)
if (IsStoredInWorldObjectGridContainer() && m_currMap)
{
if (GetTypeId() == TYPEID_CORPSE)
{
@@ -900,7 +900,7 @@ void WorldObject::Update(uint32 diff)
m_Events.Update(diff);
}
void WorldObject::SetWorldObject(bool on)
void WorldObject::SetIsStoredInWorldObjectGridContainer(bool on)
{
if (!IsInWorld())
return;
@@ -908,9 +908,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)
@@ -1801,7 +1801,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);
}
@@ -1809,7 +1809,7 @@ void WorldObject::ResetMap()
{
ASSERT(m_currMap);
ASSERT(!IsInWorld());
if (IsWorldObject())
if (IsStoredInWorldObjectGridContainer())
m_currMap->RemoveWorldObject(this);
m_currMap = nullptr;
//maybe not for corpse