diff options
Diffstat (limited to 'src/server/game/Conditions')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 12 | ||||
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.h | 5 |
2 files changed, 14 insertions, 3 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 0f3cd4ec353..3a59ccc43b7 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -910,7 +910,17 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond) Quest const *Quest = sObjectMgr.GetQuestTemplate(cond->mSourceEntry); if (!Quest) { - sLog.outErrorDb("CONDITION_SOURCE_TYPE_QUESTID specifies non-existing quest (%u), skipped", cond->mSourceEntry); + sLog.outErrorDb("CONDITION_SOURCE_TYPE_QUEST_ACCEPT specifies non-existing quest (%u), skipped", cond->mSourceEntry); + return false; + } + } + break; + case CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK: + { + Quest const *Quest = sObjectMgr.GetQuestTemplate(cond->mSourceEntry); + if (!Quest) + { + sLog.outErrorDb("CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK specifies non-existing quest (%u), skipped", cond->mSourceEntry); return false; } } diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 2a8803a6c8d..1bc284eceb6 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -80,10 +80,11 @@ enum ConditionSourceType CONDITION_SOURCE_TYPE_CREATURE_TEMPLATE_VEHICLE = 16,//DONE CONDITION_SOURCE_TYPE_SPELL = 17,//DONE CONDITION_SOURCE_TYPE_ITEM_REQUIRED_TARGET = 18,//DONE - CONDITION_SOURCE_TYPE_QUEST_ACCEPT = 19//DONE + CONDITION_SOURCE_TYPE_QUEST_ACCEPT = 19,//DONE + CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK = 20//DONE }; -#define MAX_CONDITIONSOURCETYPE 20 +#define MAX_CONDITIONSOURCETYPE 21 struct Condition { |