diff options
| author | QAston <none@none> | 2009-06-23 14:05:37 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-06-23 14:05:37 +0200 |
| commit | f2ec641e429470bd3adc01bbdf1d62e900b5fa2a (patch) | |
| tree | 0165de38d0b67f0302fb494df07d02953a028d2b /src/game/SpellMgr.h | |
| parent | 64786941ddf531bcd3b4bea1738151bfc46a19a7 (diff) | |
[8056] Move SMSG_CLEAR_COOLDOWN into function and use it. Other cleanups. Author:XTZGZoReX
[8060] Store spell_pet_auras for auraeffects instead of by whole aura Author:hunuza.
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellMgr.h')
| -rw-r--r-- | src/game/SpellMgr.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h index 9871930a8fd..b6f2c5d4eca 100644 --- a/src/game/SpellMgr.h +++ b/src/game/SpellMgr.h @@ -593,7 +593,7 @@ class PetAura bool removeOnChangePet; int32 damage; }; -typedef std::map<uint16, PetAura> SpellPetAuraMap; +typedef std::map<uint32, PetAura> SpellPetAuraMap; struct SpellArea { @@ -965,9 +965,9 @@ class SpellMgr return mSkillLineAbilityMap.upper_bound(spell_id); } - PetAura const* GetPetAura(uint16 spell_id) + PetAura const* GetPetAura(uint16 spell_id, uint8 eff) { - SpellPetAuraMap::const_iterator itr = mSpellPetAuraMap.find(spell_id); + SpellPetAuraMap::const_iterator itr = mSpellPetAuraMap.find((spell_id<<8) + eff); if(itr != mSpellPetAuraMap.end()) return &itr->second; else |