diff options
| author | Unholychick <lucas__jensen@hotmail.com> | 2014-09-16 23:56:05 +0200 |
|---|---|---|
| committer | Unholychick <lucas__jensen@hotmail.com> | 2014-09-16 23:56:05 +0200 |
| commit | 6477e96cca642f2ed65d2828872e8cc2dc4891d3 (patch) | |
| tree | f89dbc89e358653dae691d366ad9283e39fdf224 /src/server/game | |
| parent | 2a262aad21f7f9205a49769fd39c207c7ff59768 (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/game')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 0431a2b2c42..77a6b655dd9 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -8156,9 +8156,9 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg float averageDmg = 0; // now compute approximate weapon damage by formula from wowwiki.com if (procFlags & PROC_FLAG_DONE_OFFHAND_ATTACK) - averageDmg = (GetFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE) + GetFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE)) / 2; + averageDmg = (GetFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE) + GetFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE)) / 2.f; else - averageDmg = (GetFloatValue(UNIT_FIELD_MINDAMAGE) + GetFloatValue(UNIT_FIELD_MAXDAMAGE)) / 2; + averageDmg = (GetFloatValue(UNIT_FIELD_MINDAMAGE) + GetFloatValue(UNIT_FIELD_MAXDAMAGE)) / 2.f; basepoints0 = int32(averageDmg); break; |