diff options
| author | Aokromes <aokromes@gmail.com> | 2017-05-26 14:19:50 +0200 |
|---|---|---|
| committer | Aokromes <aokromes@gmail.com> | 2017-05-26 14:19:50 +0200 |
| commit | 6b2e262eb4ecb7323eabd3ddf4d24cb31cbb5775 (patch) | |
| tree | e4c1ae677ade1efeb358fad5b76195f508384513 /src/server/game/Conditions | |
| parent | 1c2e2de23f793a83db9b8799340d2fd339e84f2d (diff) | |
Core/Conditions: merge CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK with CONDITION_SOURCE_TYPE_QUEST_ACCEPT.
Diffstat (limited to 'src/server/game/Conditions')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 1 | ||||
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index e3e92d6aa3a..f5d30b835a1 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -1785,7 +1785,6 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond) const break; } case CONDITION_SOURCE_TYPE_QUEST_ACCEPT: - case CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK: if (!sObjectMgr->GetQuestTemplate(cond->SourceEntry)) { TC_LOG_ERROR("sql.sql", "%s SourceEntry specifies non-existing quest, skipped.", cond->ToString().c_str()); diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 4b77e9e99fa..e1e41206424 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -155,7 +155,7 @@ enum ConditionSourceType CONDITION_SOURCE_TYPE_SPELL = 17, CONDITION_SOURCE_TYPE_SPELL_CLICK_EVENT = 18, CONDITION_SOURCE_TYPE_QUEST_ACCEPT = 19, - CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK = 20, + // Condition source type 20 unused CONDITION_SOURCE_TYPE_VEHICLE_SPELL = 21, CONDITION_SOURCE_TYPE_SMART_EVENT = 22, CONDITION_SOURCE_TYPE_NPC_VENDOR = 23, |