diff options
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 5 | ||||
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.h | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 6df877d8895..d3336d5b158 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -1838,6 +1838,11 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond) const TC_LOG_ERROR("sql.sql", "CONDITION_SOURCE_TYPE_AREATRIGGER: is only for master branch, skipped"); return false; } + case CONDITION_SOURCE_TYPE_CONVERSATION_LINE: + { + TC_LOG_ERROR("sql.sql", "CONDITION_SOURCE_TYPE_CONVERSATION_LINE: 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 d6db55235a5..3fe3b7a83c8 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -148,8 +148,9 @@ 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 + CONDITION_SOURCE_TYPE_AREATRIGGER = 28, // only master (this refers to dynamically spawned areatriggers, not the ones from AreaTrigger.dbc/db2) + CONDITION_SOURCE_TYPE_CONVERSATION_LINE = 29, // only master + CONDITION_SOURCE_TYPE_MAX = 30 // MAX }; enum RelationType |