diff options
| -rw-r--r-- | src/server/game/Instances/InstanceSaveMgr.cpp | 11 | ||||
| -rw-r--r-- | src/server/game/Instances/InstanceSaveMgr.h | 7 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index b9b988f7a3d..50d46ed4dfb 100644 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -40,6 +40,7 @@ #include "InstanceScript.h" #include "ProgressBar.h" +uint16 InstanceSaveManager::ResetTimeDelay[] = {3600, 900, 300, 60}; InstanceSaveManager::~InstanceSaveManager() { @@ -516,17 +517,16 @@ void InstanceSaveManager::LoadResetTimes() // schedule the global reset/warning uint8 type = 1; - static int tim[4] = {3600, 900, 300, 60}; for (; type < 4; type++) - if (t - tim[type-1] > now) + if (t - ResetTimeDelay[type-1] > now) break; - ScheduleReset(true, t - tim[type-1], InstResetEvent(type, mapid, difficulty, 0)); + ScheduleReset(true, t - ResetTimeDelay[type-1], InstResetEvent(type, mapid, difficulty, 0)); for (ResetTimeMapDiffInstances::const_iterator in_itr = mapDiffResetInstances.lower_bound(map_diff_pair); in_itr != mapDiffResetInstances.upper_bound(map_diff_pair); ++in_itr) { - ScheduleReset(true, t - tim[type-1], InstResetEvent(type, mapid, difficulty, in_itr->second)); + ScheduleReset(true, t - ResetTimeDelay[type-1], InstResetEvent(type, mapid, difficulty, in_itr->second)); } } } @@ -574,8 +574,7 @@ void InstanceSaveManager::Update() { // schedule the next warning/reset event.type++; - static int tim[4] = {3600, 900, 300, 60}; - ScheduleReset(true, resetTime - tim[event.type-1], event); + ScheduleReset(true, resetTime - ResetTimeDelay[event.type-1], event); } m_resetTimeQueue.erase(m_resetTimeQueue.begin()); } diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h index 6583ce31215..39d41fff857 100644 --- a/src/server/game/Instances/InstanceSaveMgr.h +++ b/src/server/game/Instances/InstanceSaveMgr.h @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __InstanceSaveMgr_H -#define __InstanceSaveMgr_H +#ifndef _INSTANCESAVEMGR_H +#define _INSTANCESAVEMGR_H #include "Define.h" #include <ace/Singleton.h> @@ -176,6 +176,9 @@ class InstanceSaveManager uint32 GetNumBoundPlayersTotal(); uint32 GetNumBoundGroupsTotal(); + protected: + static uint16 ResetTimeDelay[]; + private: void _ResetOrWarnAll(uint32 mapid, Difficulty difficulty, bool warn, uint32 timeleft); |