From ec4a3cd9accbcc0f2bcab5cfdad8dea7cb2befad Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 6 Oct 2021 11:12:52 +0200 Subject: Core/Conditions: Reserve CONDITION_SOURCE_TYPE_AREATRIGGER for master branch --- src/server/game/Conditions/ConditionMgr.cpp | 5 +++++ src/server/game/Conditions/ConditionMgr.h | 1 + 2 files changed, 6 insertions(+) (limited to 'src') diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index eb81bcba8cb..408cd0092a4 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -1819,6 +1819,11 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond) const TC_LOG_ERROR("sql.sql", "CONDITION_SOURCE_TYPE_GRAVEYARD: is only for master branch, skipped"); return false; } + case CONDITION_SOURCE_TYPE_AREATRIGGER: + { + TC_LOG_ERROR("sql.sql", "CONDITION_SOURCE_TYPE_AREATRIGGER: is only for master branch, skipped"); + return false; + } case CONDITION_SOURCE_TYPE_GOSSIP_MENU: case CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION: case CONDITION_SOURCE_TYPE_SMART_EVENT: diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index a2e3922cfe2..d6db55235a5 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -148,6 +148,7 @@ enum ConditionSourceType CONDITION_SOURCE_TYPE_TERRAIN_SWAP = 25, // only master CONDITION_SOURCE_TYPE_PHASE = 26, // only master CONDITION_SOURCE_TYPE_GRAVEYARD = 27, // only master + CONDITION_SOURCE_TYPE_AREATRIGGER = 28, // only master CONDITION_SOURCE_TYPE_MAX = 28 // MAX }; -- cgit v1.2.3