diff options
| author | Gacko <gacko28@gmx.de> | 2014-12-01 17:20:41 +0100 |
|---|---|---|
| committer | Gacko <gacko28@gmx.de> | 2014-12-01 17:21:18 +0100 |
| commit | 05913b82084ed2b640c7e44e7a55bdb7b797ca5c (patch) | |
| tree | 6df36969c4743ad01e5fba24bbba6ff28f46f9f5 /src/server/game/Spells | |
| parent | 44cede7684e0fe0c224ab61d1a8efe776fadcc1a (diff) | |
Core/Game: Fix several warnings about wrong data types
Diffstat (limited to 'src/server/game/Spells')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 14 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 8583d055123..714284651b2 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -4301,7 +4301,7 @@ void Spell::TakeCastItem() bool expendable = false; bool withoutCharges = false; - for (int i = 0; i < proto->Effects.size(); ++i) + for (uint32 i = 0; i < proto->Effects.size(); ++i) { // item has limited charges if (proto->Effects[i].Charges) @@ -4573,7 +4573,7 @@ void Spell::TakeReagents() // if CastItem is also spell reagent if (castItemTemplate && castItemTemplate->ItemId == itemid) { - for (int s = 0; s < castItemTemplate->Effects.size(); ++s) + for (uint32 s = 0; s < castItemTemplate->Effects.size(); ++s) { // CastItem will be used up and does not count as reagent int32 charges = m_CastItem->GetSpellCharges(s); @@ -6286,15 +6286,15 @@ SpellCastResult Spell::CheckItems() case SPELL_EFFECT_CREATE_MANA_GEM: { uint32 item_id = m_spellInfo->Effects[i].ItemType; - ItemTemplate const* pProto = sObjectMgr->GetItemTemplate(item_id); + ItemTemplate const* proto = sObjectMgr->GetItemTemplate(item_id); - if (!pProto) + if (!proto) return SPELL_FAILED_ITEM_AT_MAX_CHARGES; - if (Item* pitem = player->GetItemByEntry(item_id)) + if (Item* item = player->GetItemByEntry(item_id)) { - for (int x = 0; x < pProto->Effects.size(); ++x) - if (pProto->Effects[x].Charges != 0 && pitem->GetSpellCharges(x) == pProto->Effects[x].Charges) + for (uint32 x = 0; x < proto->Effects.size(); ++x) + if (proto->Effects[x].Charges != 0 && item->GetSpellCharges(x) == proto->Effects[x].Charges) return SPELL_FAILED_ITEM_AT_MAX_CHARGES; } break; diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 98de817e7a3..eb4d0ad49de 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -5640,7 +5640,7 @@ void Spell::EffectRechargeManaGem(SpellEffIndex /*effIndex*/) if (Item* pItem = player->GetItemByEntry(item_id)) { - for (int x = 0; x < pProto->Effects.size(); ++x) + for (uint32 x = 0; x < pProto->Effects.size(); ++x) pItem->SetSpellCharges(x, pProto->Effects[x].Charges); pItem->SetState(ITEM_CHANGED, player); } |