aboutsummaryrefslogtreecommitdiff
path: root/src/game/Player.cpp
diff options
context:
space:
mode:
authorclick <none@none>2010-04-17 17:59:19 +0200
committerclick <none@none>2010-04-17 17:59:19 +0200
commitcc2db574f119547060cb7c3482fb29ec408d28a8 (patch)
treed402b11d4b318efa83ef43e2aa6f0d3ecdef147c /src/game/Player.cpp
parent6e0fa4b39e7f0bc5dcdaa503db25d5b154224a04 (diff)
Whack questgivers in the head with a bat to make them properly show ! or ? properly depending on the questtype they hand out
Patch by Liberate --HG-- branch : trunk
Diffstat (limited to 'src/game/Player.cpp')
-rw-r--r--src/game/Player.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 091d8f59428..62dc4789533 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -13752,7 +13752,7 @@ bool Player::CanCompleteQuest(uint32 quest_id)
return false;
// auto complete quest
- if (qInfo->IsAutoComplete() && CanTakeQuest(qInfo, false))
+ if ((qInfo->IsAutoComplete() || qInfo->GetFlags() & QUEST_FLAGS_AUTOCOMPLETE) && CanTakeQuest(qInfo, false))
return true;
if (q_status.m_status == QUEST_STATUS_INCOMPLETE)
@@ -13827,7 +13827,7 @@ bool Player::CanCompleteRepeatableQuest(Quest const *pQuest)
bool Player::CanRewardQuest(Quest const *pQuest, bool msg)
{
// not auto complete quest and not completed quest (only cheating case, then ignore without message)
- if (!pQuest->IsAutoComplete() && GetQuestStatus(pQuest->GetQuestId()) != QUEST_STATUS_COMPLETE)
+ if (!pQuest->IsAutoComplete() && !(pQuest->GetFlags() & QUEST_FLAGS_AUTOCOMPLETE) && GetQuestStatus(pQuest->GetQuestId()) != QUEST_STATUS_COMPLETE)
return false;
// daily quest can't be rewarded (25 daily quest already completed)