diff options
| author | Shauren <shauren.trinity@gmail.com> | 2018-03-28 22:01:22 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2018-03-28 22:01:22 +0200 |
| commit | 42f9deb21ec68e169f7ed1c8cf14092f144b22da (patch) | |
| tree | e022243733903be45592138354d1f49342c811a4 /src/server/game/Entities/Object | |
| parent | 95615a4b0d9af431b559bcca68ce9f9f38381397 (diff) | |
Core/Maps: Implemented getting area id from gameobject spawns
Yes, you can now spawn LK platform anywhere and it will treat you as inside Icecrown Citadel
Diffstat (limited to 'src/server/game/Entities/Object')
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 12 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.h | 3 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 5745b9ab5db..6175f8c7a02 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1622,17 +1622,17 @@ void WorldObject::RemoveFromWorld() uint32 WorldObject::GetZoneId() const { - return GetBaseMap()->GetZoneId(GetPhaseShift(), m_positionX, m_positionY, m_positionZ); + return GetMap()->GetZoneId(GetPhaseShift(), m_positionX, m_positionY, m_positionZ); } uint32 WorldObject::GetAreaId() const { - return GetBaseMap()->GetAreaId(GetPhaseShift(), m_positionX, m_positionY, m_positionZ); + return GetMap()->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); + GetMap()->GetZoneAndAreaId(GetPhaseShift(), zoneid, areaid, m_positionX, m_positionY, m_positionZ); } InstanceScript* WorldObject::GetInstanceScript() @@ -2332,12 +2332,6 @@ void WorldObject::ResetMap() //m_InstanceId = 0; } -Map const* WorldObject::GetBaseMap() const -{ - ASSERT(m_currMap); - return m_currMap->GetParent(); -} - void WorldObject::AddObjectToRemoveList() { ASSERT(m_uint32Values); diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index 3dcc769b8ab..13b75f8bc89 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -497,9 +497,6 @@ class TC_GAME_API WorldObject : public Object, public WorldLocation Map* FindMap() const { return m_currMap; } //used to check all object's GetMap() calls when object is not in world! - //this function should be removed in nearest time... - Map const* GetBaseMap() const; - void SetZoneScript(); ZoneScript* GetZoneScript() const { return m_zoneScript; } |