*Do not make getmapid virtual function to improve speed.

--HG--
branch : trunk

1 files changed, 5 insertions, 1 deletions

diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index e6027f6d5a4..411114aeb65 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -1080,7 +1080,7 @@ bool Object::PrintIndexError(uint32 index, bool set) const
 }
 
 WorldObject::WorldObject()
-    : m_phaseMask(PHASEMASK_NORMAL),
+    : m_mapId(0), m_InstanceId(0), m_phaseMask(PHASEMASK_NORMAL),
     m_positionX(0.0f), m_positionY(0.0f), m_positionZ(0.0f), m_orientation(0.0f), m_currMap(NULL)
     , m_zoneScript(NULL)
     , m_isActive(false), m_isWorldObject(false)
@@ -1713,6 +1713,8 @@ void WorldObject::SetMap(Map * map)
 
     ASSERT(!m_currMap);
     m_currMap = map;
+    m_mapId = map->GetId();
+    m_InstanceId = map->GetInstanceId();
     if(m_isWorldObject)
         m_currMap->AddWorldObject(this);
 }
@@ -1724,6 +1726,8 @@ void WorldObject::ResetMap()
     if(m_isWorldObject)
         m_currMap->RemoveWorldObject(this);
     m_currMap = NULL;
+    m_mapId = 0;
+    m_InstanceId = 0;
 }
 
 Map const* WorldObject::GetBaseMap() const