diff options
| author | n0n4m3 <none@none> | 2009-12-26 11:38:30 +0100 |
|---|---|---|
| committer | n0n4m3 <none@none> | 2009-12-26 11:38:30 +0100 |
| commit | 2fa14abf42ab4a094405b5407b39faaf018d9072 (patch) | |
| tree | 3f5e67b7416caf617c84a4391d2431839c2b1df1 /src/game/Creature.h | |
| parent | 25c28cae98c519a267c3a00002f649e26874dfb0 (diff) | |
Move some grid object functions into one parent class
--HG--
branch : trunk
Diffstat (limited to 'src/game/Creature.h')
| -rw-r--r-- | src/game/Creature.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/game/Creature.h b/src/game/Creature.h index 6470af4bb71..b3e3a8a4555 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -397,7 +397,7 @@ typedef std::map<uint32,time_t> CreatureSpellCooldowns; #define MAX_VENDOR_ITEMS 150 // Limitation in 3.x.x item count in SMSG_LIST_INVENTORY -class TRINITY_DLL_SPEC Creature : public Unit +class TRINITY_DLL_SPEC Creature : public Unit, public GridObject<Creature> { public: @@ -607,7 +607,6 @@ class TRINITY_DLL_SPEC Creature : public Unit bool hasQuest(uint32 quest_id) const; bool hasInvolvedQuest(uint32 quest_id) const; - GridReference<Creature> &GetGridRef() { return m_gridRef; } bool isRegeneratingHealth() { return m_regenHealth; } virtual uint8 GetPetAutoSpellSize() const { return CREATURE_MAX_SPELLS; } virtual uint32 GetPetAutoSpellOnPos(uint8 pos) const @@ -711,8 +710,6 @@ class TRINITY_DLL_SPEC Creature : public Unit //Formation var CreatureGroup *m_formation; - - GridReference<Creature> m_gridRef; }; class AssistDelayEvent : public BasicEvent |