From 1f24d991e3192d9de10c0a2e7c9629e3857a2c44 Mon Sep 17 00:00:00 2001 From: Schmoozerd Date: Sun, 22 Apr 2012 23:34:59 +0200 Subject: [PATCH] [11975] Use a few more enums instead of magic numbers --- src/game/Spell.cpp | 10 +++++----- src/game/SpellMgr.cpp | 2 +- src/shared/revision_nr.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 86aa0afb3..60b339e05 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -585,7 +585,7 @@ void Spell::FillTargetMap() SetTargetMap(SpellEffectIndex(i), m_spellInfo->EffectImplicitTargetB[i], tmpUnitLists[i /*==effToIndex[i]*/]); } break; - case 0: + case TARGET_NONE: SetTargetMap(SpellEffectIndex(i), m_spellInfo->EffectImplicitTargetA[i], tmpUnitLists[i /*==effToIndex[i]*/]); tmpUnitLists[i /*==effToIndex[i]*/].push_back(m_caster); break; @@ -598,7 +598,7 @@ void Spell::FillTargetMap() case TARGET_TABLE_X_Y_Z_COORDINATES: switch(m_spellInfo->EffectImplicitTargetB[i]) { - case 0: + case TARGET_NONE: SetTargetMap(SpellEffectIndex(i), m_spellInfo->EffectImplicitTargetA[i], tmpUnitLists[i /*==effToIndex[i]*/]); // need some target for processing @@ -616,7 +616,7 @@ void Spell::FillTargetMap() case TARGET_SELF2: switch(m_spellInfo->EffectImplicitTargetB[i]) { - case 0: + case TARGET_NONE: case TARGET_EFFECT_SELECT: SetTargetMap(SpellEffectIndex(i), m_spellInfo->EffectImplicitTargetA[i], tmpUnitLists[i /*==effToIndex[i]*/]); break; @@ -629,7 +629,7 @@ void Spell::FillTargetMap() case TARGET_DUELVSPLAYER_COORDINATES: switch(m_spellInfo->EffectImplicitTargetB[i]) { - case 0: + case TARGET_NONE: case TARGET_EFFECT_SELECT: SetTargetMap(SpellEffectIndex(i), m_spellInfo->EffectImplicitTargetA[i], tmpUnitLists[i /*==effToIndex[i]*/]); if (Unit* currentTarget = m_targets.getUnitTarget()) @@ -644,7 +644,7 @@ void Spell::FillTargetMap() default: switch(m_spellInfo->EffectImplicitTargetB[i]) { - case 0: + case TARGET_NONE: case TARGET_EFFECT_SELECT: SetTargetMap(SpellEffectIndex(i), m_spellInfo->EffectImplicitTargetA[i], tmpUnitLists[i /*==effToIndex[i]*/]); break; diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index b8b7ae199..1a501dd6e 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -3575,7 +3575,7 @@ bool SpellMgr::IsSpellValid(SpellEntry const* spellInfo, Player* pl, bool msg) { switch(spellInfo->Effect[i]) { - case 0: + case SPELL_EFFECT_NONE: continue; // craft spell for crafting nonexistent item (break client recipes list show) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index e4a189644..ac3a50482 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11974" + #define REVISION_NR "11975" #endif // __REVISION_NR_H__