Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-20 18:05:32 -05:00
parent 6b801a2df8 922453f362
commit 95a0928190
15 changed files with 134 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/game/Object.cpp
View File

@@ -1145,6 +1145,7 @@ WorldObject::WorldObject()
m_mapId = 0;
m_InstanceId = 0;
m_map = NULL;
m_name = "";
@@ -1674,12 +1675,14 @@ void WorldObject::SendObjectDeSpawnAnim(uint64 guid)
Map* WorldObject::GetMap() const
{
return MapManager::Instance().GetMap(GetMapId(), this);
if(m_map) return m_map;
else return const_cast<Map*>(m_map) = MapManager::Instance().GetMap(GetMapId(), this);
}
Map* WorldObject::FindMap() const
{
return MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
if(m_map) return m_map;
else return const_cast<Map*>(m_map) = MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
}
Map const* WorldObject::GetBaseMap() const