[12304] Do not scale non-scalable effects

Signed-off-by: Yaki Khadafi <elsoldollo@gmail.com>
mangos · Oct 23, 2012 · fb7a095 · fb7a095
1 parent 4d086c5
commit fb7a095
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/game/DBCStructure.h b/src/game/DBCStructure.h
@@ -1803,6 +1803,8 @@ struct SpellScalingEntry
     float     coeff3[3];                                    // 11-13
     float     coefBase;                                     // 14       some coefficient, mostly 1.0f
     uint32    coefLevelBase;                                // 15       some level
+
+    bool IsScalableEffect(SpellEffectIndex i) const { return coeff1[i] != 0.0f; };
 };
 
 // SpellShapeshift.dbc

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
@@ -9296,7 +9296,7 @@ int32 Unit::CalculateSpellDamage(Unit const* target, SpellEntry const* spellProt
 
     SpellScalingEntry const* scalingEntry = spellProto->GetSpellScaling();
     GtSpellScalingEntry const* gtScalingEntry = NULL;
-    if (scalingEntry)
+    if (scalingEntry && scalingEntry->IsScalableEffect(effect_index))
     {
         if (target && IsAuraApplyEffect(spellProto, effect_index) && IsPositiveEffect(spellProto, effect_index))
             level = target->getLevel();

diff --git 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 "12303"
+ #define REVISION_NR "12304"
 #endif // __REVISION_NR_H__