diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-07 11:59:51 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-07 11:59:51 +0200 |
| commit | c0fc0f237f7e85ab3c5cc422fea7a1000fa72b23 (patch) | |
| tree | 8f9ba881f1e2eb5e58a712afbeb9bb0cb5753e35 /src/server/game/Conditions | |
| parent | 0c96062687475191685d07b014e888ffcfbf5534 (diff) | |
| parent | 33f8c3ead4da07ff024a94b5e8cf0d05c2ebc23a (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/shared/DataStores/DBCFileLoader.h
Diffstat (limited to 'src/server/game/Conditions')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 14a933f781b..d92a77d51b6 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -161,7 +161,7 @@ enum InstanceInfo INSTANCE_INFO_BOSS_STATE }; -enum +enum MaxConditionTargets { MAX_CONDITION_TARGETS = 3 }; |