diff options
| author | Machiavelli <none@none> | 2010-09-04 17:27:28 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2010-09-04 17:27:28 +0200 |
| commit | f19d7c2ec716c0c57d8b9fd565693fbdb130803f (patch) | |
| tree | 65f4498a28a55f5ee2f07feae3e2f85dd2ddc470 | |
| parent | 27c00a8cbbfb684630a8977ccd1b007d9e69d441 (diff) | |
Core/WorldRunnable: Convert the last part of autobroadcast (interval config) to Trinity standards (proper caching) as well. Patch by 41782992@qq.com.
Closes issue #3796
--HG--
branch : trunk
| -rw-r--r-- | src/server/game/World/World.cpp | 5 | ||||
| -rw-r--r-- | src/server/game/World/World.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index f479b67aaea..3afe5bae580 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -1215,6 +1215,7 @@ void World::LoadConfigSettings(bool reload) // AutoBroadcast m_bool_configs[CONFIG_AUTOBROADCAST] = sConfig.GetBoolDefault("AutoBroadcast.On", false); m_int_configs[CONFIG_AUTOBROADCAST_CENTER] = sConfig.GetIntDefault("AutoBroadcast.Center", 0); + m_int_configs[CONFIG_AUTOBROADCAST_INTERVAL] = sConfig.GetIntDefault("AutoBroadcast.Timer", 60000); sScriptMgr.OnConfigLoad(reload); } @@ -1642,8 +1643,6 @@ void World::SetInitialWorldSettings() LoginDatabase.PExecute("INSERT INTO uptime (realmid, starttime, startstring, uptime, revision) VALUES('%u', " UI64FMTD ", '%s', 0, '%s')", realmID, uint64(m_startTime), isoDate, _FULLVERSION); - static uint32 abtimer = 0; - abtimer = sConfig.GetIntDefault("AutoBroadcast.Timer", 60000); m_timers[WUPDATE_OBJECTS].SetInterval(IN_MILLISECONDS/2); m_timers[WUPDATE_SESSIONS].SetInterval(0); m_timers[WUPDATE_WEATHERS].SetInterval(1*IN_MILLISECONDS); @@ -1654,7 +1653,7 @@ void World::SetInitialWorldSettings() //erase corpses every 20 minutes m_timers[WUPDATE_CLEANDB].SetInterval(m_int_configs[CONFIG_LOGDB_CLEARINTERVAL]*MINUTE*IN_MILLISECONDS); // clean logs table every 14 days by default - m_timers[WUPDATE_AUTOBROADCAST].SetInterval(abtimer); + m_timers[WUPDATE_AUTOBROADCAST].SetInterval(getIntConfig(CONFIG_AUTOBROADCAST_INTERVAL)); m_timers[WUPDATE_DELETECHARS].SetInterval(DAY*IN_MILLISECONDS); // check for chars to delete every day //to set mailtimer to return mails every day between 4 and 5 am diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 411ae3a8887..cf72cd01519 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -302,6 +302,7 @@ enum WorldIntConfigs CONFIG_CHARDELETE_METHOD, CONFIG_CHARDELETE_MIN_LEVEL, CONFIG_AUTOBROADCAST_CENTER, + CONFIG_AUTOBROADCAST_INTERVAL, INT_CONFIG_VALUE_COUNT }; |