diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2015-04-25 19:53:55 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2015-04-25 19:55:19 +0200 |
| commit | f6d3da7dce2464a89d9a9b20a95325808ac6efe4 (patch) | |
| tree | 9d408702c2061ca82c2e647b4f4cfb1db828aba9 /src | |
| parent | 02fd2de847944090d58c803738fa3218d90ab31e (diff) | |
Core: Fix warning
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Item/ItemTemplate.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Handlers/QuestHandler.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Entities/Item/ItemTemplate.cpp b/src/server/game/Entities/Item/ItemTemplate.cpp index bbb923fddf6..34a6ee635a6 100644 --- a/src/server/game/Entities/Item/ItemTemplate.cpp +++ b/src/server/game/Entities/Item/ItemTemplate.cpp @@ -37,7 +37,7 @@ char const* ItemTemplate::GetDefaultLocaleName() const uint32 ItemTemplate::GetArmor(uint32 itemLevel) const { - uint32 quality = ItemQualities(GetQuality()) != ITEM_QUALITY_HEIRLOOM ? GetQuality() : ITEM_QUALITY_RARE; + uint32 quality = ItemQualities(GetQuality()) != ITEM_QUALITY_HEIRLOOM ? ItemQualities(GetQuality()) : ITEM_QUALITY_RARE; if (quality > ITEM_QUALITY_ARTIFACT) return 0; @@ -74,7 +74,7 @@ uint32 ItemTemplate::GetArmor(uint32 itemLevel) const void ItemTemplate::GetDamage(uint32 itemLevel, float& minDamage, float& maxDamage) const { minDamage = maxDamage = 0.0f; - uint32 quality = ItemQualities(GetQuality()) != ITEM_QUALITY_HEIRLOOM ? GetQuality() : ITEM_QUALITY_RARE; + uint32 quality = ItemQualities(GetQuality()) != ITEM_QUALITY_HEIRLOOM ? ItemQualities(GetQuality()) : ITEM_QUALITY_RARE; if (GetClass() != ITEM_CLASS_WEAPON || quality > ITEM_QUALITY_ARTIFACT) return; diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index 19bb132c528..36296355577 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -256,7 +256,7 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPackets::Quest::Quest bool itemValid = false; for (uint32 i = 0; i < quest->GetRewChoiceItemsCount(); ++i) { - if (quest->RewardChoiceItemId[i] && quest->RewardChoiceItemId[i] == packet.ItemChoiceID) + if (quest->RewardChoiceItemId[i] && quest->RewardChoiceItemId[i] == uint32(packet.ItemChoiceID)) { itemValid = true; break; @@ -269,7 +269,7 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPackets::Quest::Quest { for (QuestPackageItemEntry const* questPackageItem : *questPackageItems) { - if (questPackageItem->ItemID != packet.ItemChoiceID) + if (questPackageItem->ItemID != uint32(packet.ItemChoiceID)) continue; if (ItemTemplate const* rewardProto = sObjectMgr->GetItemTemplate(questPackageItem->ItemID)) |