diff options
| author | megamage <none@none> | 2009-07-01 18:07:20 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-07-01 18:07:20 -0500 |
| commit | e1d93bd00f676701b1de87f86a1f2fc5cfc11438 (patch) | |
| tree | 092bc22e10ba60a13b5bf04ee351f614d8679b4c /src/game/SpellMgr.h | |
| parent | 8122a15f467a8493cd5c49decc4fe09499b78af4 (diff) | |
*Backup your DB!
[8098] Support uint32 spell ids in code. Author: VladimirMangos
* Propertly work with uint32 spell ids in player action bar
* Fix in same time bug with not save equipment set button with id==0
* Merge misc field in character_action and playercreateinfo_action to action field as 3 byte
* Propertly load uint32 spell ids from character_spell
* Fixed types for some pet/creature related structure for spell id storing.
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellMgr.h')
| -rw-r--r-- | src/game/SpellMgr.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h index afdf75a8399..226d2a6da6f 100644 --- a/src/game/SpellMgr.h +++ b/src/game/SpellMgr.h @@ -552,20 +552,20 @@ class PetAura auras.clear(); } - PetAura(uint16 petEntry, uint16 aura, bool _removeOnChangePet, int _damage) : + PetAura(uint32 petEntry, uint32 aura, bool _removeOnChangePet, int _damage) : removeOnChangePet(_removeOnChangePet), damage(_damage) { auras[petEntry] = aura; } - uint16 GetAura(uint16 petEntry) const + uint32 GetAura(uint32 petEntry) const { - std::map<uint16, uint16>::const_iterator itr = auras.find(petEntry); + std::map<uint32, uint32>::const_iterator itr = auras.find(petEntry); if(itr != auras.end()) return itr->second; else { - std::map<uint16, uint16>::const_iterator itr2 = auras.find(0); + std::map<uint32, uint32>::const_iterator itr2 = auras.find(0); if(itr2 != auras.end()) return itr2->second; else @@ -573,7 +573,7 @@ class PetAura } } - void AddAura(uint16 petEntry, uint16 aura) + void AddAura(uint32 petEntry, uint32 aura) { auras[petEntry] = aura; } @@ -589,7 +589,7 @@ class PetAura } private: - std::map<uint16, uint16> auras; + std::map<uint32, uint32> auras; bool removeOnChangePet; int32 damage; }; @@ -726,7 +726,7 @@ class SpellMgr // Accessors (const or static functions) public: // Spell affects - flag96 const*GetSpellAffect(uint16 spellId, uint8 effectId) const + flag96 const*GetSpellAffect(uint32 spellId, uint8 effectId) const { SpellAffectMap::const_iterator itr = mSpellAffectMap.find((spellId<<8) + effectId); if( itr != mSpellAffectMap.end( ) ) @@ -965,7 +965,7 @@ class SpellMgr return mSkillLineAbilityMap.upper_bound(spell_id); } - PetAura const* GetPetAura(uint16 spell_id, uint8 eff) + PetAura const* GetPetAura(uint32 spell_id, uint8 eff) { SpellPetAuraMap::const_iterator itr = mSpellPetAuraMap.find((spell_id<<8) + eff); if(itr != mSpellPetAuraMap.end()) |