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

Core/Conditions: reserve sourcetype value

Browse Source
This commit is contained in:
ariel-
2018-03-15 02:16:17 -03:00
parent ddd60a948c
commit a60728b3d2
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

2
src/server/game/Miscellaneous/Language.h
View File

@@ -213,7 +213,7 @@ enum TrinityStrings
LANG_INVALID_GAMEOBJECT_TYPE = 176,
LANG_GAMEOBJECT_DAMAGED = 177,
LANG_GRID_POSITION = 178,
// 179-185 used in 6.x branch
// 179-185 used in master branch
LANG_TRANSPORT_POSITION = 186,
LANG_PARTIAL_GROUP_SUMMON = 187,
// Room for more level 1 188-199 not used