From d577d00313c673b51e79181ed8a5eb3146aded9e Mon Sep 17 00:00:00 2001
From: QAston <none@none>
Date: Sat, 1 Aug 2009 19:50:42 +0200
Subject: *Store mapId in Corpse class for access to corpse when grid
 containing them is unloaded and map pointer is unloaded leading to crash.

--HG--
branch : trunk
---
 src/game/Object.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/game/Object.h')

diff --git a/src/game/Object.h b/src/game/Object.h
index 732d9bc8944..0e5bcd25a09 100644
--- a/src/game/Object.h
+++ b/src/game/Object.h
@@ -439,7 +439,7 @@ class TRINITY_DLL_SPEC WorldObject : public Object
 
         void GetRandomPoint( float x, float y, float z, float distance, float &rand_x, float &rand_y, float &rand_z ) const;
 
-        uint32 GetMapId() const { return m_currMap ? m_currMap->GetId() : 0; }
+        virtual uint32 GetMapId() const { return m_currMap ? m_currMap->GetId() : 0; }
         uint32 GetInstanceId() const { return m_currMap ? m_currMap->GetInstanceId() : 0; }
 
         virtual void SetPhaseMask(uint32 newPhaseMask, bool update);
-- 
cgit v1.2.3