Shutdown messages are now sent in blizzlike intervals. Author: Shauren

This commit is contained in:
stfx 2011-09-20 18:31:52 +03:00
parent b8b1676aaf
commit 9050b5af7e

View file

@ -1862,19 +1862,13 @@ void World::ShutdownMsg(bool show, Player* player)
if(m_ShutdownMask & SHUTDOWN_MASK_IDLE) if(m_ShutdownMask & SHUTDOWN_MASK_IDLE)
return; return;
///- Display a message every 12 hours, hours, 5 minutes, minute, 5 seconds and finally seconds ///- Display a message every 12 hours, 1 hour, 5 minutes, 1 minute and 15 seconds
if ( show || if (show ||
(m_ShutdownTimer < 10) || (m_ShutdownTimer < 5 * MINUTE && (m_ShutdownTimer % 15) == 0) || // < 5 min; every 15 sec
// < 30 sec; every 5 sec (m_ShutdownTimer < 15 * MINUTE && (m_ShutdownTimer % MINUTE) == 0) || // < 15 min; every 1 min
(m_ShutdownTimer<30 && (m_ShutdownTimer % 5 )==0) || (m_ShutdownTimer < 30 * MINUTE && (m_ShutdownTimer % (5 * MINUTE)) == 0) || // < 30 min; every 5 min
// < 5 min ; every 1 min (m_ShutdownTimer < 12 * HOUR && (m_ShutdownTimer % HOUR) == 0) || // < 12 h; every 1 h
(m_ShutdownTimer<5*MINUTE && (m_ShutdownTimer % MINUTE )==0) || (m_ShutdownTimer >= 12 * HOUR && (m_ShutdownTimer % (12 * HOUR)) == 0)) // >= 12 h; every 12 h
// < 30 min ; every 5 min
(m_ShutdownTimer<30*MINUTE && (m_ShutdownTimer % (5*MINUTE))==0) ||
// < 12 h ; every 1 h
(m_ShutdownTimer<12*HOUR && (m_ShutdownTimer % HOUR )==0) ||
// > 12 h ; every 12 h
(m_ShutdownTimer>12*HOUR && (m_ShutdownTimer % (12*HOUR) )==0))
{ {
std::string str = secsToTimeString(m_ShutdownTimer); std::string str = secsToTimeString(m_ShutdownTimer);