From 72b1d30a1c9ae5a9cffbe77128ff10e83b1c650a Mon Sep 17 00:00:00 2001
From: zergtmn <zerg@myisp.com>
Date: Mon, 27 Dec 2010 19:04:54 +0500
Subject: [PATCH] [10923] Cleanup some magic numbers

---
 src/game/Creature.cpp    | 2 +-
 src/game/Unit.cpp        | 9 +++++----
 src/shared/revision_nr.h | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 242c0a11f..3941cf1bb 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -130,7 +130,7 @@ m_creatureInfo(NULL), m_splineFlags(SPLINEFLAG_WALKMODE)
     m_regenTimer = 200;
     m_valuesCount = UNIT_END;
 
-    for(int i = 0; i < 4; ++i)
+    for(int i = 0; i < CREATURE_MAX_SPELLS; ++i)
         m_spells[i] = 0;
 
     m_CreatureSpellCooldowns.clear();
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index ad4807f13..b5c43892e 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -8733,18 +8733,19 @@ int32 Unit::CalculateSpellDamage(Unit const* target, SpellEntry const* spellProt
     if (comboDamage != 0 && unitPlayer && target && (target->GetObjectGuid() == unitPlayer->GetComboTargetGuid()))
         value += (int32)(comboDamage * comboPoints);
 
-    if(Player* modOwner = GetSpellModOwner())
+    if (Player* modOwner = GetSpellModOwner())
     {
         modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_ALL_EFFECTS, value);
+
         switch(effect_index)
         {
-            case 0:
+            case EFFECT_INDEX_0:
                 modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_EFFECT1, value);
                 break;
-            case 1:
+            case EFFECT_INDEX_1:
                 modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_EFFECT2, value);
                 break;
-            case 2:
+            case EFFECT_INDEX_2:
                 modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_EFFECT3, value);
                 break;
         }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 406389aa3..7a79b2b6b 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 "10922"
+ #define REVISION_NR "10923"
 #endif // __REVISION_NR_H__