Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler
(cherry picked from commit a22e4e121a1e54b2f4154d59623ee4a94a449176) Conflicts: cmake/compiler/msvc/settings.cmake src/server/game/DataStores/DBCStores.cpp src/server/game/Entities/GameObject/GameObject.cpp src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Object/Object.h src/server/game/Entities/Pet/Pet.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Garrison/Garrison.cpp src/server/game/Garrison/GarrisonMgr.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Globals/ObjectMgr.h src/server/game/Guilds/GuildMgr.cpp src/server/game/Handlers/CharacterHandler.cpp src/server/game/Handlers/QueryHandler.cpp src/server/game/Handlers/QuestHandler.cpp src/server/game/Handlers/SpellHandler.cpp src/server/game/Server/Packets/ChannelPackets.h src/server/game/Server/Packets/PartyPackets.cpp src/server/game/Server/WorldSession.h src/server/game/Spells/Spell.cpp src/server/game/Spells/SpellInfo.cpp src/server/game/Spells/SpellScript.cpp src/server/scripts/Commands/cs_list.cpp
This commit is contained in:
1 parent
b703d53073
commit
b4adf3f5dd
30 files changed
+216
-226
No files matched your search
@@ -3408,9 +3408,9 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex)
|
||||
uint32 eff_damage(std::max(weaponDamage, 0));
|
||||
|
||||
// Add melee damage bonuses (also check for negative)
|
||||
uint32 damage = m_caster->MeleeDamageBonusDone(unitTarget, eff_damage, m_attackType, m_spellInfo);
|
||||
uint32 damageBonusDone = m_caster->MeleeDamageBonusDone(unitTarget, eff_damage, m_attackType, m_spellInfo);
|
||||
|
||||
m_damage += unitTarget->MeleeDamageBonusTaken(m_caster, damage, m_attackType, m_spellInfo);
|
||||
m_damage += unitTarget->MeleeDamageBonusTaken(m_caster, damageBonusDone, m_attackType, m_spellInfo);
|
||||
}
|
||||
|
||||
void Spell::EffectThreat(SpellEffIndex /*effIndex*/)
|
||||
@@ -3664,9 +3664,9 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex)
|
||||
case 54426:
|
||||
if (unitTarget)
|
||||
{
|
||||
int32 damage = int32(unitTarget->GetHealth()) - int32(unitTarget->CountPctFromMaxHealth(5));
|
||||
if (damage > 0)
|
||||
m_caster->CastCustomSpell(28375, SPELLVALUE_BASE_POINT0, damage, unitTarget);
|
||||
int32 decimateDamage = int32(unitTarget->GetHealth()) - int32(unitTarget->CountPctFromMaxHealth(5));
|
||||
if (decimateDamage > 0)
|
||||
m_caster->CastCustomSpell(28375, SPELLVALUE_BASE_POINT0, decimateDamage, unitTarget);
|
||||
}
|
||||
return;
|
||||
// Mirren's Drinking Hat
|
||||
|
||||
Reference in new issue
Block a user