Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 00:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Conditions: Reserve CONDITION_SOURCE_TYPE_CONVERSATION_LINE = 29 for master branch

Browse Source
This commit is contained in:
Shauren
2021-10-25 16:35:56 +02:00
parent 822b32b64b
commit b0eaa938c9
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/game/Conditions/ConditionMgr.cpp
View File

@@ -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:

5
src/server/game/Conditions/ConditionMgr.h
View File

@@ -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