diff options
| author | Spp <spp@jorge.gr> | 2012-12-19 08:23:34 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-12-19 08:23:34 +0100 |
| commit | 80b1b6c4940a43fa0db175097a54d6cb50e7b15c (patch) | |
| tree | ab3c1f0d7ea2df6fb563e3af7e205fcc84baacda /src/server/game/World | |
| parent | a227a3494766103cf6805cf52839612854c2767b (diff) | |
| parent | a2832805afb9a8a3434172479c814ca2a729ece1 (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
src/server/game/World/World.h
src/server/scripts/Kalimdor/moonglade.cpp
Diffstat (limited to 'src/server/game/World')
| -rw-r--r-- | src/server/game/World/World.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 505ccd939c6..3158756cba5 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -487,11 +487,13 @@ enum RealmZone enum WorldStates { - WS_WEEKLY_QUEST_RESET_TIME = 20002, // Next weekly reset time - WS_BG_DAILY_RESET_TIME = 20003, // Next daily BG reset time - WS_MONTHLY_QUEST_RESET_TIME = 20004, // Next monthly reset time - WS_GUILD_DAILY_RESET_TIME = 20006, // Next guild cap reset time - WS_GUILD_WEEKLY_RESET_TIME = 20007, // Next guild week 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 + WS_GUILD_DAILY_RESET_TIME = 20006, // Next guild cap reset time + WS_MONTHLY_QUEST_RESET_TIME = 20007, // Next monthly reset time + // Cata specific custom worldstates + WS_GUILD_WEEKLY_RESET_TIME = 20050, // Next guild week reset time }; /// Storage class for commands issued for delayed execution |