diff options
author | Shauren <shauren.trinity@gmail.com> | 2016-01-19 20:43:35 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2016-01-19 20:43:35 +0100 |
commit | a36d8d54c5d0ba9cd0f75f9b2ef23d167a275364 (patch) | |
tree | 885c8e3af0596dc0b6c4336db2f1ccb04f87ceb7 | |
parent | 3cd3184394068a2737556a03cdc0be8722397347 (diff) |
Warning fix
-rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 40f6b748d59..8224f1ead71 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -15800,9 +15800,9 @@ void Player::CurrencyChanged(uint32 currencyId, int32 change) continue; QuestStatusData& q_status = m_QuestStatus[questid]; - int64 value = GetCurrency(currencyId); if (obj.Type == QUEST_OBJECTIVE_CURRENCY || obj.Type == QUEST_OBJECTIVE_HAVE_CURRENCY) { + int64 value = GetCurrency(currencyId); if (obj.Type == QUEST_OBJECTIVE_HAVE_CURRENCY) SetQuestObjectiveData(qInfo, obj.StorageIndex, int32(std::min<int64>(value, obj.Amount))); @@ -15820,10 +15820,10 @@ void Player::CurrencyChanged(uint32 currencyId, int32 change) IncompleteQuest(questid); } } - else if (obj.Type == QUEST_OBJECTIVE_OBTAIN_CURRENCY && value > 0) // currency losses are not accounted for in this objective type + else if (obj.Type == QUEST_OBJECTIVE_OBTAIN_CURRENCY && change > 0) // currency losses are not accounted for in this objective type { int64 currentProgress = GetQuestObjectiveData(qInfo, obj.StorageIndex); - SetQuestObjectiveData(qInfo, obj.StorageIndex, int32(std::max(std::min<int64>(currentProgress + value, obj.Amount), SI64LIT(0)))); + SetQuestObjectiveData(qInfo, obj.StorageIndex, int32(std::max(std::min<int64>(currentProgress + change, obj.Amount), SI64LIT(0)))); if (CanCompleteQuest(questid)) CompleteQuest(questid); } |