Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 10 Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage committed 2009-04-20 20:31:20 -05:00
2 parents fc7e1db9fb df26c17a11
commit 0c56b79e96
3 files changed
+12 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/Object.cpp
+4 -6
View File
@@ -1673,16 +1673,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