diff options
| author | Shauren <shauren.trinity@gmail.com> | 2013-04-16 02:43:31 -0700 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2013-04-16 02:43:31 -0700 |
| commit | 1c59bbd130ceaaf48b6f70605a0a63b0802b8eb2 (patch) | |
| tree | 420f07c244e1043bd7677ab92f6e1aac0b2768de /src/server/game/Events/GameEventMgr.cpp | |
| parent | 2a96e1919dc00a57df89f5b164fdbc42a7ee4c0f (diff) | |
| parent | 19b47e452fff6ca20d1ba1b7ab4c037d87aa4df0 (diff) | |
Merge pull request #9647 from xjose93/GameEventAnnounce
Core/Events: announce event system improvement.
Diffstat (limited to 'src/server/game/Events/GameEventMgr.cpp')
| -rw-r--r-- | src/server/game/Events/GameEventMgr.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 9141f77b852..737a6d1b91c 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -205,8 +205,8 @@ void GameEventMgr::LoadFromDB() { { uint32 oldMSTime = getMSTime(); - // 0 1 2 3 4 5 6 7 - QueryResult result = WorldDatabase.Query("SELECT eventEntry, UNIX_TIMESTAMP(start_time), UNIX_TIMESTAMP(end_time), occurence, length, holiday, description, world_event FROM game_event"); + // 0 1 2 3 4 5 6 7 8 + QueryResult result = WorldDatabase.Query("SELECT eventEntry, UNIX_TIMESTAMP(start_time), UNIX_TIMESTAMP(end_time), occurence, length, holiday, description, world_event, announce FROM game_event"); if (!result) { mGameEvent.clear(); @@ -237,6 +237,7 @@ void GameEventMgr::LoadFromDB() pGameEvent.state = (GameEventState)(fields[7].GetUInt8()); pGameEvent.nextstart = 0; + pGameEvent.announce = fields[8].GetUInt8(); if (pGameEvent.length == 0 && pGameEvent.state == GAMEEVENT_NORMAL) // length>0 is validity check { @@ -1104,7 +1105,8 @@ void GameEventMgr::UnApplyEvent(uint16 event_id) void GameEventMgr::ApplyNewEvent(uint16 event_id) { - if (sWorld->getBoolConfig(CONFIG_EVENT_ANNOUNCE)) + uint8 announce = mGameEvent[event_id].announce; + if (announce == 1 || (announce == 2 && sWorld->getBoolConfig(CONFIG_EVENT_ANNOUNCE))) sWorld->SendWorldText(LANG_EVENTMESSAGE, mGameEvent[event_id].description.c_str()); sLog->outInfo(LOG_FILTER_GAMEEVENTS, "GameEvent %u \"%s\" started.", event_id, mGameEvent[event_id].description.c_str()); |