From 4b83c5c88ea9a62bbf9a397302417edad91e05f0 Mon Sep 17 00:00:00 2001 From: NoFantasy Date: Tue, 19 Oct 2010 11:57:49 +0200 Subject: [PATCH] [10624] Fix quests w/QuestFlags QUEST_FLAGS_AUTO_REWARDED Signed-off-by: NoFantasy --- src/game/Player.cpp | 11 +++++++++++ src/shared/revision_nr.h | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/game/Player.cpp b/src/game/Player.cpp index d9e6e9315..497d0593d 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -13324,6 +13324,17 @@ bool Player::CanCompleteQuest( uint32 quest_id ) const if (!qInfo) return false; + // only used for "flag" quests and not real in-game quests + if (qInfo->HasFlag(QUEST_FLAGS_AUTO_REWARDED)) + { + // a few checks, not all "satisfy" is needed + if (SatisfyQuestPreviousQuest(qInfo, false) && SatisfyQuestLevel(qInfo, false) && + SatisfyQuestSkill(qInfo, false) && SatisfyQuestRace(qInfo, false) && SatisfyQuestClass(qInfo, false)) + return true; + + return false; + } + // auto complete quest if (qInfo->IsAutoComplete() && CanTakeQuest(qInfo, false)) return true; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index d4cf8ae9c..0acaff7bd 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10623" + #define REVISION_NR "10624" #endif // __REVISION_NR_H__