diff options
author | QAston <qaston@gmail.com> | 2013-02-26 11:05:10 +0100 |
---|---|---|
committer | QAston <qaston@gmail.com> | 2013-02-26 11:05:10 +0100 |
commit | 6403e3fbfeacc305268f596a9ba9fb6b8c8dbdf7 (patch) | |
tree | a9bc39d0708648e3e807c47e5e220e1aba036829 | |
parent | e49e470787cc0bfdab07521a5b16f3def16ba800 (diff) |
Core/SpellsMgr: remove unneeded functions from spellmgr, add some const modifiers for methods
-rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 21 | ||||
-rw-r--r-- | src/server/game/Spells/SpellMgr.h | 8 |
2 files changed, 6 insertions, 23 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 312189ffad8..1795c46b342 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -592,21 +592,6 @@ bool SpellMgr::IsSpellRequiringSpell(uint32 spellid, uint32 req_spellid) const return false; } -const SpellsRequiringSpellMap SpellMgr::GetSpellsRequiringSpell() -{ - return this->mSpellsReqSpell; -} - -uint32 SpellMgr::GetSpellRequired(uint32 spell_id) const -{ - SpellRequiredMap::const_iterator itr = mSpellReq.find(spell_id); - - if (itr == mSpellReq.end()) - return 0; - - return itr->second; -} - SpellLearnSkillNode const* SpellMgr::GetSpellLearnSkill(uint32 spell_id) const { SpellLearnSkillMap::const_iterator itr = mSpellLearnSkills.find(spell_id); @@ -777,7 +762,7 @@ SpellProcEventEntry const* SpellMgr::GetSpellProcEvent(uint32 spellId) const return NULL; } -bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellProcEvent, uint32 EventProcFlag, SpellInfo const* procSpell, uint32 procFlags, uint32 procExtra, bool active) +bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellProcEvent, uint32 EventProcFlag, SpellInfo const* procSpell, uint32 procFlags, uint32 procExtra, bool active) const { // No extra req need uint32 procEvent_procEx = PROC_EX_NONE; @@ -914,7 +899,7 @@ SpellProcEntry const* SpellMgr::GetSpellProcEntry(uint32 spellId) const return NULL; } -bool SpellMgr::CanSpellTriggerProcOnEvent(SpellProcEntry const& procEntry, ProcEventInfo& eventInfo) +bool SpellMgr::CanSpellTriggerProcOnEvent(SpellProcEntry const& procEntry, ProcEventInfo& eventInfo) const { // proc type doesn't match if (!(eventInfo.GetTypeMask() & procEntry.typeMask)) @@ -1015,7 +1000,7 @@ SkillLineAbilityMapBounds SpellMgr::GetSkillLineAbilityMapBounds(uint32 spell_id return mSkillLineAbilityMap.equal_range(spell_id); } -PetAura const* SpellMgr::GetPetAura(uint32 spell_id, uint8 eff) +PetAura const* SpellMgr::GetPetAura(uint32 spell_id, uint8 eff) const { SpellPetAuraMap::const_iterator itr = mSpellPetAuraMap.find((spell_id<<8) + eff); if (itr != mSpellPetAuraMap.end()) diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index 0cdb9601370..dcec7e84132 100644 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -630,8 +630,6 @@ class SpellMgr SpellRequiredMapBounds GetSpellsRequiredForSpellBounds(uint32 spell_id) const; SpellsRequiringSpellMapBounds GetSpellsRequiringSpellBounds(uint32 spell_id) const; bool IsSpellRequiringSpell(uint32 spellid, uint32 req_spellid) const; - const SpellsRequiringSpellMap GetSpellsRequiringSpell(); - uint32 GetSpellRequired(uint32 spell_id) const; // Spell learning SpellLearnSkillNode const* GetSpellLearnSkill(uint32 spell_id) const; @@ -656,11 +654,11 @@ class SpellMgr // Spell proc event table SpellProcEventEntry const* GetSpellProcEvent(uint32 spellId) const; - bool IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellProcEvent, uint32 EventProcFlag, SpellInfo const* procSpell, uint32 procFlags, uint32 procExtra, bool active); + bool IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellProcEvent, uint32 EventProcFlag, SpellInfo const* procSpell, uint32 procFlags, uint32 procExtra, bool active) const; // Spell proc table SpellProcEntry const* GetSpellProcEntry(uint32 spellId) const; - bool CanSpellTriggerProcOnEvent(SpellProcEntry const& procEntry, ProcEventInfo& eventInfo); + bool CanSpellTriggerProcOnEvent(SpellProcEntry const& procEntry, ProcEventInfo& eventInfo) const; // Spell bonus data table SpellBonusEntry const* GetSpellBonusData(uint32 spellId) const; @@ -670,7 +668,7 @@ class SpellMgr SkillLineAbilityMapBounds GetSkillLineAbilityMapBounds(uint32 spell_id) const; - PetAura const* GetPetAura(uint32 spell_id, uint8 eff); + PetAura const* GetPetAura(uint32 spell_id, uint8 eff) const; SpellEnchantProcEntry const* GetSpellEnchantProcEvent(uint32 enchId) const; bool IsArenaAllowedEnchancment(uint32 ench_id) const; |