diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-07 16:39:01 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-07 16:39:01 +0100 |
| commit | ecedb798aa3094f02bedaadf459cfec7cb7c58a4 (patch) | |
| tree | 1666ff41bed0084e13094ac53c1b2334a22bec3f /src/server/game/Conditions/ConditionMgr.h | |
| parent | d5163d846fcbbd94655f0ba93c81a3e2bd302b3c (diff) | |
| parent | d0e4e202658206aa40e656101334b446ebc9f18e (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Conditions/ConditionMgr.h
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.h')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 8826c7cc484..cd3cf7bbbd8 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -128,8 +128,9 @@ enum ConditionSourceType CONDITION_SOURCE_TYPE_VEHICLE_SPELL = 21, CONDITION_SOURCE_TYPE_SMART_EVENT = 22, CONDITION_SOURCE_TYPE_NPC_VENDOR = 23, - CONDITION_SOURCE_TYPE_PHASE_DEFINITION = 24, - CONDITION_SOURCE_TYPE_MAX = 25 // MAX + CONDITION_SOURCE_TYPE_SPELL_PROC = 24, + CONDITION_SOURCE_TYPE_PHASE_DEFINITION = 25, + CONDITION_SOURCE_TYPE_MAX = 26 // MAX }; enum ComparisionType |