josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[8026] Obtain object's map directly by calling appropriate WorldObject::GetMap()/GetBaseMap() functions instead of accessing MapManager. Code cleanups. Big thanks Infinity for tests. Author: Ambal

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-06-16 11:19:59 -05:00
parent aaec3c8191
commit 3cf2be6042
26 changed files with 104 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/MapInstanced.h
+3 -4
View File
@@ -43,7 +43,7 @@ class TRINITY_DLL_DECL MapInstanced : public Map
bool CanEnter(Player* player);
Map* GetInstance(const WorldObject* obj);
Map* FindMap(uint32 InstanceId) { return _FindMap(InstanceId); }
Map* FindMap(uint32 InstanceId) const { return _FindMap(InstanceId); }
void DestroyInstance(uint32 InstanceId);
void DestroyInstance(InstancedMaps::iterator &itr);
@@ -69,10 +69,9 @@ class TRINITY_DLL_DECL MapInstanced : public Map
InstancedMaps m_InstancedMaps;
Map* _FindMap(uint32 InstanceId)
Map* _FindMap(uint32 InstanceId) const
{
InstancedMaps::iterator i = m_InstancedMaps.find(InstanceId);
InstancedMaps::const_iterator i = m_InstancedMaps.find(InstanceId);
return(i == m_InstancedMaps.end() ? NULL : i->second);
}