diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-15 03:47:21 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-15 03:47:21 +0100 |
| commit | f7aedaef3303b38d2e54faaad6ff80b66aaea074 (patch) | |
| tree | 8f5df9c7482adafded212bee31ae68e91dbe1840 /src/server/game/Events/GameEventMgr.h | |
| parent | 506ddbbf40d588840cd8eee810761b6a5ed44973 (diff) | |
| parent | dcfbe53552b0a242a88a068a6e3e7f4c863f2ffb (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Spells/SpellInfo.h
src/server/game/World/World.cpp
Diffstat (limited to 'src/server/game/Events/GameEventMgr.h')
| -rw-r--r-- | src/server/game/Events/GameEventMgr.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h index bad27983235..d2999bbbe34 100644 --- a/src/server/game/Events/GameEventMgr.h +++ b/src/server/game/Events/GameEventMgr.h @@ -55,7 +55,8 @@ typedef std::map<uint32 /*condition id*/, GameEventFinishCondition> GameEventCon struct GameEventData { - GameEventData() : start(1), end(0), nextstart(0), occurence(0), length(0), holiday_id(HOLIDAY_NONE), state(GAMEEVENT_NORMAL) { } + GameEventData() : start(1), end(0), nextstart(0), occurence(0), length(0), holiday_id(HOLIDAY_NONE), state(GAMEEVENT_NORMAL), + announce(0) { } time_t start; // occurs after this time time_t end; // occurs before this time time_t nextstart; // after this time the follow-up events count this phase completed |