diff options
| author | Machiavelli <none@none> | 2009-06-16 18:40:57 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-06-16 18:40:57 +0200 |
| commit | bd054b84533305420e368fae85921e43c2382c78 (patch) | |
| tree | 3ad43004b3505717781792afcdb80e7bf389bff2 /src/game/Object.cpp | |
| parent | e6c3d54e2686b4b7ee9f8ae3bd5815e126b8bfa6 (diff) | |
| parent | 560ca5a2102a082f6712e1a3ec58f9f367532ade (diff) | |
*Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/Object.cpp')
| -rw-r--r-- | src/game/Object.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game/Object.cpp b/src/game/Object.cpp index b2ad38ceb47..0e7eed9bff0 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -1101,17 +1101,17 @@ void WorldObject::_Create( uint32 guidlow, HighGuid guidhigh, uint32 mapid, uint uint32 WorldObject::GetZoneId() const { - return MapManager::Instance().GetBaseMap(m_mapId)->GetZoneId(m_positionX, m_positionY, m_positionZ); + return GetBaseMap()->GetZoneId(m_positionX, m_positionY, m_positionZ); } uint32 WorldObject::GetAreaId() const { - return MapManager::Instance().GetBaseMap(m_mapId)->GetAreaId(m_positionX, m_positionY, m_positionZ); + return GetBaseMap()->GetAreaId(m_positionX, m_positionY, m_positionZ); } void WorldObject::GetZoneAndAreaId(uint32& zoneid, uint32& areaid) const { - MapManager::Instance().GetBaseMap(m_mapId)->GetZoneAndAreaId(zoneid, areaid, m_positionX, m_positionY, m_positionZ); + GetBaseMap()->GetZoneAndAreaId(zoneid, areaid, m_positionX, m_positionY, m_positionZ); } InstanceData* WorldObject::GetInstanceData() @@ -1448,7 +1448,7 @@ void WorldObject::GetRandomPoint( float x, float y, float z, float distance, flo void WorldObject::UpdateGroundPositionZ(float x, float y, float &z) const { - float new_z = MapManager::Instance().GetBaseMap(GetMapId())->GetHeight(x,y,z,true); + float new_z = GetBaseMap()->GetHeight(x,y,z,true); if(new_z > INVALID_HEIGHT) z = new_z+ 0.05f; // just to be sure that we are not a few pixel under the surface } @@ -1679,7 +1679,7 @@ Map* WorldObject::_findMap() Map const* WorldObject::GetBaseMap() const { - return MapManager::Instance().GetBaseMap(GetMapId()); + return MapManager::Instance().CreateBaseMap(GetMapId()); } void WorldObject::AddObjectToRemoveList() |