Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 00:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Core/Objects: use map to get area and zone id"

Browse Source 
This reverts commit 5ad547d8d9.
This commit is contained in:
Ovahlord
2018-03-12 11:55:28 +01:00
parent 78793ac452
commit 6afdbfc8ce
2 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1310,21 +1310,6 @@ void WorldObject::RemoveFromWorld()
Object::RemoveFromWorld();
}
uint32 WorldObject::GetZoneId() const
{
return GetBaseMap()->GetZoneId(GetPhaseShift(), m_positionX, m_positionY, m_positionZ);
}
uint32 WorldObject::GetAreaId() const
{
return GetBaseMap()->GetAreaId(GetPhaseShift(), m_positionX, m_positionY, m_positionZ);
}
void WorldObject::GetZoneAndAreaId(uint32& zoneid, uint32& areaid) const
{
GetBaseMap()->GetZoneAndAreaId(GetPhaseShift(), zoneid, areaid, m_positionX, m_positionY, m_positionZ);
}
InstanceScript* WorldObject::GetInstanceScript() const
{
Map* map = GetMap();

6
src/server/game/Entities/Object/Object.h
View File

@@ -498,9 +498,9 @@ class TC_GAME_API WorldObject : public Object, public WorldLocation
// if negative it is used as PhaseGroupId
void SetDBPhase(int32 p) { _dbPhase = p; }
uint32 GetZoneId() const;
uint32 GetAreaId() const;
void GetZoneAndAreaId(uint32& zoneid, uint32& areaid) const;
uint32 GetZoneId() const { return m_zoneId; }
uint32 GetAreaId() const { return m_areaId; }
void GetZoneAndAreaId(uint32& zoneid, uint32& areaid) const { zoneid = m_zoneId, areaid = m_areaId; }
InstanceScript* GetInstanceScript() const;