aboutsummaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authormaximius <none@none>2009-08-11 22:42:41 -0700
committermaximius <none@none>2009-08-11 22:42:41 -0700
commitab0049fd33e6caef812c989488788a637576a1c0 (patch)
tree0cf2a4900f85c313de0993ffe2c4bec91277dcf4 /src/game
parent941fd64a240f65751b28a3ae7765f17a01b7ad2a (diff)
parentf0c8efea55df7d1938e7959f9268e0f86e88b4bd (diff)
*Merge
--HG-- branch : trunk
Diffstat (limited to 'src/game')
-rw-r--r--src/game/Creature.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Creature.h b/src/game/Creature.h
index f2f02d165eb..2c882cad949 100644
--- a/src/game/Creature.h
+++ b/src/game/Creature.h
@@ -500,7 +500,7 @@ class TRINITY_DLL_SPEC Creature : public Unit
void Update( uint32 time ); // overwrited Unit::Update
void GetRespawnCoord(float &x, float &y, float &z, float* ori = NULL, float* dist =NULL) const;
- uint32 GetEquipmentId() const { return m_equipmentId; }
+ uint32 GetEquipmentId() const { return GetCreatureInfo()->equipmentId; }
uint32 HasSummonMask(uint32 mask) const { return mask & m_summonMask; }
bool isSummon() const { return m_summonMask & SUMMON_MASK_SUMMON; }