diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2012-12-31 15:26:57 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2012-12-31 15:26:57 +0100 |
| commit | 6317878b6f76fc1b9431520ee6f8cce8d487bd8c (patch) | |
| tree | dafc4ad48d7327ac816714151751bca50549de5c /src/server/game/Conditions/ConditionMgr.h | |
| parent | 871f8c800392cdf8739a6bd4808c532ba88e85ea (diff) | |
| parent | edb90f957baa9d9bb83f4477954593117e9fa858 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.h')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 807b75c4ee6..520e786a66a 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -46,7 +46,7 @@ enum ConditionTypes CONDITION_DRUNKENSTATE = 10, // DrunkenState 0, 0 true if player is drunk enough CONDITION_WORLD_STATE = 11, // index value 0 true if world has the value for the index CONDITION_ACTIVE_EVENT = 12, // event_id 0 0 true if event is active - CONDITION_INSTANCE_DATA = 13, // entry data 0 true if data is set in current instance + CONDITION_INSTANCE_INFO = 13, // entry data type true if the instance info defined by type (enum InstanceInfo) equals data. CONDITION_QUEST_NONE = 14, // quest_id 0 0 true if doesn't have quest saved CONDITION_CLASS = 15, // class 0 0 true if player's class is equal to class CONDITION_RACE = 16, // race 0 0 true if player's race is equal to race @@ -152,6 +152,13 @@ enum RelationType RELATION_MAX }; +enum InstanceInfo +{ + INSTANCE_INFO_DATA = 0, + INSTANCE_INFO_DATA64, + INSTANCE_INFO_BOSS_STATE +}; + enum { MAX_CONDITION_TARGETS = 3 |