diff options
| author | azazel <none@none> | 2010-08-26 15:54:56 +0600 |
|---|---|---|
| committer | azazel <none@none> | 2010-08-26 15:54:56 +0600 |
| commit | 5fa14f58dceb3be78a5964c09eb17dc358c10c7b (patch) | |
| tree | 1c7b2c1d7f19ca7d56a602b023a1d3b724f2e72c /src/server/game/Spells/Spell.cpp | |
| parent | 6036166716d2d2cdfa0f5c27f8cfb7e1e65b0c8f (diff) | |
Core/Cleanup:
* move repeating code into separate method for storing locale strings in ObjectMgr (copy/paste sucks, you know)
* fix 'signed/unsigned' warnings (at least in VS)
* fix some other warnings and cleanup relative code
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index f8128a632ea..9b53c31b814 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -988,7 +988,7 @@ void Spell::AddUnitTarget(Unit* pVictim, uint32 effIndex) if (m_auraScaleMask && ihit->effectMask == m_auraScaleMask && m_caster != pVictim) { SpellEntry const * auraSpell = sSpellStore.LookupEntry(sSpellMgr.GetFirstSpellInChain(m_spellInfo->Id)); - if ((pVictim->getLevel() + 10) >= auraSpell->spellLevel) + if (uint32(pVictim->getLevel() + 10) >= auraSpell->spellLevel) ihit->scaleAura = true; } return; @@ -1009,7 +1009,7 @@ void Spell::AddUnitTarget(Unit* pVictim, uint32 effIndex) if (m_auraScaleMask && target.effectMask == m_auraScaleMask && m_caster != pVictim) { SpellEntry const * auraSpell = sSpellStore.LookupEntry(sSpellMgr.GetFirstSpellInChain(m_spellInfo->Id)); - if ((pVictim->getLevel() + 10) >= auraSpell->spellLevel) + if (uint32(pVictim->getLevel() + 10) >= auraSpell->spellLevel) target.scaleAura = true; } @@ -5983,7 +5983,7 @@ SpellCastResult Spell::CheckPower() // health as power used - need check health amount if (m_spellInfo->powerType == POWER_HEALTH) { - if (m_caster->GetHealth() <= m_powerCost) + if (int32(m_caster->GetHealth()) <= m_powerCost) return SPELL_FAILED_CASTER_AURASTATE; return SPELL_CAST_OK; } @@ -6004,7 +6004,7 @@ SpellCastResult Spell::CheckPower() // Check power amount Powers powerType = Powers(m_spellInfo->powerType); - if (m_caster->GetPower(powerType) < m_powerCost) + if (int32(m_caster->GetPower(powerType)) < m_powerCost) return SPELL_FAILED_NO_POWER; else return SPELL_CAST_OK; |