aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
authorUnholychick <lucas__jensen@hotmail.com>2014-09-16 23:56:05 +0200
committerUnholychick <lucas__jensen@hotmail.com>2014-09-16 23:56:05 +0200
commit6477e96cca642f2ed65d2828872e8cc2dc4891d3 (patch)
treef89dbc89e358653dae691d366ad9283e39fdf224 /src/server/scripts
parent2a262aad21f7f9205a49769fd39c207c7ff59768 (diff)
Core/Spells: Fix some -Wconversion warnings
Attempt to fix #13152 by properly casting between data types during damage calculations.
Diffstat (limited to 'src/server/scripts')
-rw-r--r--src/server/scripts/Spells/spell_warrior.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp
index 58820b1e215..9709532f56f 100644
--- a/src/server/scripts/Spells/spell_warrior.cpp
+++ b/src/server/scripts/Spells/spell_warrior.cpp
@@ -271,13 +271,13 @@ class spell_warr_deep_wounds : public SpellScriptLoader
ApplyPct(damage, 16 * GetSpellInfo()->GetRank());
SpellInfo const* spellInfo = sSpellMgr->EnsureSpellInfo(SPELL_WARRIOR_DEEP_WOUNDS_PERIODIC);
- uint32 ticks = spellInfo->GetDuration() / spellInfo->Effects[EFFECT_0].Amplitude;
+ uint32 ticks = uint32(spellInfo->GetDuration()) / spellInfo->Effects[EFFECT_0].Amplitude;
// Add remaining ticks to damage done
if (AuraEffect const* aurEff = target->GetAuraEffect(SPELL_WARRIOR_DEEP_WOUNDS_PERIODIC, EFFECT_0, caster->GetGUID()))
- damage += aurEff->GetDamage() * (ticks - aurEff->GetTickNumber());
+ damage += aurEff->GetDamage() * int32(ticks - aurEff->GetTickNumber());
- damage /= ticks;
+ damage /= int32(ticks);
caster->CastCustomSpell(target, SPELL_WARRIOR_DEEP_WOUNDS_PERIODIC, &damage, NULL, NULL, true);
}