aboutsummaryrefslogtreecommitdiff
path: root/src/game/Object.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-04-20 19:57:01 -0500
committermegamage <none@none>2009-04-20 19:57:01 -0500
commitdf26c17a114401d24e73fbbec8e0ed5e8a939a94 (patch)
tree203473b804b64380bd438030a3758283caef2aa2 /src/game/Object.cpp
parentb57429c44c8e957bd3650f6dcd8d94b2067cabef (diff)
*Try to fix compile in linux.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Object.cpp')
-rw-r--r--src/game/Object.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 7ca7a58f90c..e7d07422c7a 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -1554,16 +1554,14 @@ void WorldObject::SendObjectDeSpawnAnim(uint64 guid)
SendMessageToSet(&data, true);
}
-Map* WorldObject::GetMap() const
+Map* WorldObject::_getMap()
{
- if(m_map) return m_map;
- else return const_cast<Map*>(m_map) = MapManager::Instance().GetMap(GetMapId(), this);
+ return m_map = MapManager::Instance().GetMap(GetMapId(), this);
}
-Map* WorldObject::FindMap() const
+Map* WorldObject::_findMap()
{
- if(m_map) return m_map;
- else return const_cast<Map*>(m_map) = MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
+ return m_map = MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
}
Map const* WorldObject::GetBaseMap() const