From df26c17a114401d24e73fbbec8e0ed5e8a939a94 Mon Sep 17 00:00:00 2001 From: megamage Date: Mon, 20 Apr 2009 19:57:01 -0500 Subject: *Try to fix compile in linux. --HG-- branch : trunk --- src/game/Object.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/game/Object.cpp') 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(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(m_map) = MapManager::Instance().FindMap(GetMapId(), GetInstanceId()); + return m_map = MapManager::Instance().FindMap(GetMapId(), GetInstanceId()); } Map const* WorldObject::GetBaseMap() const -- cgit v1.2.3