aboutsummaryrefslogtreecommitdiff
path: root/src/game/SpellAuras.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-09 17:44:59 -0600
committermegamage <none@none>2009-03-09 17:44:59 -0600
commit7b43f68ff78bb626b5c842f1cf904b7639131da1 (patch)
tree90e6f991eeec8f7678da3afcca1d6a247bdac501 /src/game/SpellAuras.cpp
parent1131953fa1a9e892bdd30621ce0cf8d0bb740b60 (diff)
[7419] Fixed some type convertion warnings. Author: VladimirMangos
--HG-- branch : trunk
Diffstat (limited to 'src/game/SpellAuras.cpp')
-rw-r--r--src/game/SpellAuras.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index d5c160a9768..c2b9863f710 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -2970,7 +2970,7 @@ void Aura::HandleModPossessPet(bool apply, bool Real)
else
pet->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_24);
- ((Player*)caster)->SetFarSightGUID(apply ? pet->GetGUID() : NULL);
+ ((Player*)caster)->SetFarSightGUID(apply ? pet->GetGUID() : 0);
((Player*)caster)->SetCharm(apply ? pet : NULL);
((Player*)caster)->SetClientControl(pet, apply ? 1 : 0);
@@ -3935,7 +3935,7 @@ void Aura::HandleAuraPeriodicDummy(bool apply, bool Real)
{
// Explosive Shot
if (apply && !loading && caster)
- m_modifier.m_amount +=caster->GetTotalAttackPowerValue(RANGED_ATTACK) * 16 / 100;
+ m_modifier.m_amount += int32(caster->GetTotalAttackPowerValue(RANGED_ATTACK) * 16 / 100);
break;
}
}