From 0a773fa6eab21be1debbdee113b9d94b2e6de398 Mon Sep 17 00:00:00 2001 From: stfx Date: Tue, 20 Sep 2011 18:31:52 +0300 Subject: [PATCH] Shutdown messages are now sent in blizzlike intervals. Author: Shauren --- src/game/World.cpp | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/game/World.cpp b/src/game/World.cpp index 4fb7184e3d0..a3838936073 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -1862,19 +1862,13 @@ void World::ShutdownMsg(bool show, Player* player) if(m_ShutdownMask & SHUTDOWN_MASK_IDLE) return; - ///- Display a message every 12 hours, hours, 5 minutes, minute, 5 seconds and finally seconds - if ( show || - (m_ShutdownTimer < 10) || - // < 30 sec; every 5 sec - (m_ShutdownTimer<30 && (m_ShutdownTimer % 5 )==0) || - // < 5 min ; every 1 min - (m_ShutdownTimer<5*MINUTE && (m_ShutdownTimer % MINUTE )==0) || - // < 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)) + ///- Display a message every 12 hours, 1 hour, 5 minutes, 1 minute and 15 seconds + if (show || + (m_ShutdownTimer < 5 * MINUTE && (m_ShutdownTimer % 15) == 0) || // < 5 min; every 15 sec + (m_ShutdownTimer < 15 * MINUTE && (m_ShutdownTimer % MINUTE) == 0) || // < 15 min; every 1 min + (m_ShutdownTimer < 30 * MINUTE && (m_ShutdownTimer % (5 * MINUTE)) == 0) || // < 30 min; every 5 min + (m_ShutdownTimer < 12 * HOUR && (m_ShutdownTimer % HOUR) == 0) || // < 12 h; every 1 h + (m_ShutdownTimer >= 12 * HOUR && (m_ShutdownTimer % (12 * HOUR)) == 0)) // >= 12 h; every 12 h { std::string str = secsToTimeString(m_ShutdownTimer);