diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2018-03-15 02:16:17 -0300 |
|---|---|---|
| committer | ariel- <ariel-@users.noreply.github.com> | 2018-03-15 02:21:48 -0300 |
| commit | a60728b3d2e145fa4b8dc1818bab9dcc91fc4c0f (patch) | |
| tree | fab58c6d6895d8cd4594d956d399f46d95d726f2 /src/server/game/Conditions | |
| parent | ddd60a948c432aaac1d9a9ff05c9cf22ada35813 (diff) | |
Core/Conditions: reserve sourcetype value
Diffstat (limited to 'src/server/game/Conditions')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 9 | ||||
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.h | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index b6881990567..a4eaf47a07f 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -1754,12 +1754,17 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond) const } case CONDITION_SOURCE_TYPE_TERRAIN_SWAP: { - TC_LOG_ERROR("sql.sql", "CONDITION_SOURCE_TYPE_TERRAIN_SWAP: is only for 6.x branch, skipped"); + TC_LOG_ERROR("sql.sql", "CONDITION_SOURCE_TYPE_TERRAIN_SWAP: is only for master branch, skipped"); return false; } case CONDITION_SOURCE_TYPE_PHASE: { - TC_LOG_ERROR("sql.sql", "CONDITION_SOURCE_TYPE_PHASE: is only for 6.x branch, skipped"); + TC_LOG_ERROR("sql.sql", "CONDITION_SOURCE_TYPE_PHASE: is only for master branch, skipped"); + return false; + } + case CONDITION_SOURCE_TYPE_GRAVEYARD: + { + TC_LOG_ERROR("sql.sql", "CONDITION_SOURCE_TYPE_GRAVEYARD: is only for master branch, skipped"); return false; } case CONDITION_SOURCE_TYPE_GOSSIP_MENU: diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 67bbd5755bd..d313f718c1b 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -75,7 +75,7 @@ enum ConditionTypes CONDITION_HP_PCT = 38, // hpPct ComparisonType 0 true if unit's hp matches given pct CONDITION_REALM_ACHIEVEMENT = 39, // achievement_id 0 0 true if realm achievement is complete CONDITION_IN_WATER = 40, // 0 0 0 true if unit in water - CONDITION_TERRAIN_SWAP = 41, // only for 6.x + CONDITION_TERRAIN_SWAP = 41, // only for master branch CONDITION_STAND_STATE = 42, // stateType state 0 true if unit matches specified sitstate (0,x: has exactly state x; 1,0: any standing state; 1,1: any sitting state;) CONDITION_DAILY_QUEST_DONE = 43, // quest id 0 0 true if daily quest has been completed for the day CONDITION_CHARMED = 44, // 0 0 0 true if unit is currently charmed @@ -139,9 +139,10 @@ enum ConditionSourceType CONDITION_SOURCE_TYPE_SMART_EVENT = 22, CONDITION_SOURCE_TYPE_NPC_VENDOR = 23, CONDITION_SOURCE_TYPE_SPELL_PROC = 24, - CONDITION_SOURCE_TYPE_TERRAIN_SWAP = 25, // only 6.x - CONDITION_SOURCE_TYPE_PHASE = 26, // only 6.x - CONDITION_SOURCE_TYPE_MAX = 27 // MAX + 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_MAX = 28 // MAX }; enum RelationType |