diff options
| author | megamage <none@none> | 2009-03-09 17:44:59 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-09 17:44:59 -0600 |
| commit | 7b43f68ff78bb626b5c842f1cf904b7639131da1 (patch) | |
| tree | 90e6f991eeec8f7678da3afcca1d6a247bdac501 /src | |
| parent | 1131953fa1a9e892bdd30621ce0cf8d0bb740b60 (diff) | |
[7419] Fixed some type convertion warnings. Author: VladimirMangos
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/SpellAuras.cpp | 4 | ||||
| -rw-r--r-- | src/game/SpellEffects.cpp | 2 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 2 | ||||
| -rw-r--r-- | src/shared/revision_nr.h | 2 |
4 files changed, 5 insertions, 5 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; } } diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 1f143bacf88..349051b727a 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -1393,7 +1393,7 @@ void Spell::EffectDummy(uint32 i) if (m_spellInfo->SpellFamilyFlags[0] & 0x40000) { // In 303 exist spirit depend - uint32 spirit = m_caster->GetStat(STAT_SPIRIT); + uint32 spirit = uint32(m_caster->GetStat(STAT_SPIRIT)); switch (m_spellInfo->Id) { case 1454: damage+=spirit; break; diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index affe75d41d0..171526aaf7f 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -6705,7 +6705,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB //else if (auraSpellInfo->Id==47300) // Dark Flame Aura else if (auraSpellInfo->Id==57345) // Darkmoon Card: Greatness { - uint32 stat = 0; + float stat = 0.0f; // strength if (GetStat(STAT_STRENGTH) > stat) { trigger_spell_id = 60229;stat = GetStat(STAT_STRENGTH); } // agility diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 377261b73fd..b22640c2f98 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7418" + #define REVISION_NR "7419" #endif // __REVISION_NR_H__ |