diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 9695ec835..3083cdf79 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -11308,8 +11308,6 @@ int32 Unit::CalculateSpellDamage(SpellEntry const* spellProto, SpellEffectIndex int32 randomPoints = int32(spellProto->EffectDieSides[effect_index]); float comboDamage = spellProto->EffectPointsPerComboPoint[effect_index]; - int32 value = basePoints; - if(randomPoints != 0) { // range can have positive and negative values, so order its for irand @@ -11320,6 +11318,8 @@ int32 Unit::CalculateSpellDamage(SpellEntry const* spellProto, SpellEffectIndex basePoints += randvalue; } + int32 value = basePoints; + // random damage if(comboDamage != 0 && unitPlayer && target && (target->GetGUID() == unitPlayer->GetComboTarget())) value += (int32)(comboDamage * comboPoints); diff --git a/src/shared/Auth/BigNumber.cpp b/src/shared/Auth/BigNumber.cpp index 3bd1957d9..27bae8986 100644 --- a/src/shared/Auth/BigNumber.cpp +++ b/src/shared/Auth/BigNumber.cpp @@ -60,7 +60,8 @@ void BigNumber::SetQword(uint64 val) void BigNumber::SetBinary(const uint8 *bytes, int len) { uint8 t[1000]; - for (int i = 0; i < len; i++) t[i] = bytes[len - 1 - i]; + for (int i = 0; i < len; i++) + t[i] = bytes[len - 1 - i]; BN_bin2bn(t, len, _bn); } diff --git a/src/shared/Auth/Sha1.h b/src/shared/Auth/Sha1.h index 1a777c8c8..abe8c8e94 100644 --- a/src/shared/Auth/Sha1.h +++ b/src/shared/Auth/Sha1.h @@ -31,7 +31,6 @@ class Sha1Hash Sha1Hash(); ~Sha1Hash(); - void UpdateFinalizeBigNumbers(BigNumber *bn0, ...); void UpdateBigNumbers(BigNumber *bn0, ...); void UpdateData(const uint8 *dta, int len);