diff options
| author | ShinDarth <borzifrancesco@gmail.com> | 2016-08-13 16:32:19 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-02-12 14:23:09 +0100 |
| commit | 7f38c2759a3b6b332fa634cdf1287d6edfba44e9 (patch) | |
| tree | 93d3418ca5002908cc3eb8b45058b3e901338de8 | |
| parent | 9d5304fd4f9824c1beb640ae96bf0513d26926ff (diff) | |
Core/Worldstates: move WS_ARENA_DISTRIBUTION_TIME declaration
(cherry picked from commit 54a7b8358e1a75ecf990e39d9e2697348d744ff1)
| -rw-r--r-- | src/server/game/Battlegrounds/BattlegroundMgr.h | 2 | ||||
| -rw-r--r-- | src/server/game/World/World.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.h b/src/server/game/Battlegrounds/BattlegroundMgr.h index 1849c032714..75ec14f1b0b 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.h +++ b/src/server/game/Battlegrounds/BattlegroundMgr.h @@ -29,8 +29,6 @@ typedef std::set<uint32> BattlegroundClientIdsContainer; typedef std::unordered_map<uint32, BattlegroundTypeId> BattleMastersMap; -#define WS_CURRENCY_RESET_TIME 20001 // Custom worldstate - struct BattlegroundData { BattlegroundContainer m_Battlegrounds; diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 49624b42e55..2a460ef23df 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -532,6 +532,7 @@ enum RealmZone enum WorldStates { + WS_CURRENCY_RESET_TIME = 20001, // Next currency reset time WS_WEEKLY_QUEST_RESET_TIME = 20002, // Next weekly reset time WS_BG_DAILY_RESET_TIME = 20003, // Next daily BG reset time WS_CLEANING_FLAGS = 20004, // Cleaning Flags |