diff options
| author | Rat <gmstreetrat@gmail.com> | 2014-12-01 21:09:23 +0100 |
|---|---|---|
| committer | Rat <gmstreetrat@gmail.com> | 2014-12-01 21:09:23 +0100 |
| commit | b91ac01bc7b9f9a60b85f7e92b88a8d4c16d350c (patch) | |
| tree | 752ff4331fa77c4ad907f30c075b930072ca18e8 /src/server/game/Spells/Spell.cpp | |
| parent | e7f3f11ed5d7fec26de2c4fd9f2cb219d8019f9b (diff) | |
| parent | 05913b82084ed2b640c7e44e7a55bdb7b797ca5c (diff) | |
Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into Spells
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index c6b92f66fb9..303a885c39c 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -4365,7 +4365,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) @@ -4607,7 +4607,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); @@ -6343,15 +6343,15 @@ SpellCastResult Spell::CheckItems() case SPELL_EFFECT_CREATE_MANA_GEM: { uint32 item_id = effect->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; |