From f3d4b60852c556cf23036b4afb135a86dc5dde6c Mon Sep 17 00:00:00 2001
From: Glen Masgai <mimosius@gmx.de>
Date: Mon, 18 Oct 2010 17:59:00 +0000
Subject: [PATCH] client timeupdate() fix

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5766 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/clientgame.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index c6a7bfe2..2bd5e419 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -798,9 +798,8 @@ void timeupdate(int milliscur, int millismax)
     lastgametimeupdate = lastmillis;
     gametimecurrent = milliscur;
     gametimemaximum = millismax;
-    int millisremaining = gametimemaximum - gametimecurrent;
-    minutesremaining = ceil((1.0f*millisremaining)/60000.0f);
-    if(!millisremaining)
+    minutesremaining = (gametimemaximum - gametimecurrent + 60000 - 1) / 60000;
+    if(!minutesremaining)
     {
         intermission = true;
         extern bool needsautoscreenshot;
@@ -810,17 +809,17 @@ void timeupdate(int milliscur, int millismax)
         conoutf(_("game has ended!"));
         consolescores();
         showscores(true);
-		if(identexists("start_intermission")) execute("start_intermission");
+        if(identexists("start_intermission")) execute("start_intermission");
     }
     else
     {
         extern int clockdisplay; // only output to console if no hud-clock is being shown
-        if(clockdisplay==0) conoutf(_("time remaining: %d minutes"), minutesremaining);
-        if(millisremaining==60000)
+        if(minutesremaining==1)
         {
             audiomgr.musicsuggest(M_LASTMINUTE1 + rnd(2), 70*1000, true);
             hudoutf("1 minute left!");
         }
+        else if(clockdisplay==0) conoutf(_("time remaining: %d minutes"), minutesremaining);
     }
 }
 
@@ -953,7 +952,7 @@ void startmap(const char *name, bool reset)   // called just after a map load
     intermission = false;
     showscores(false);
     minutesremaining = -1;
-	lastgametimeupdate = 0;
+    lastgametimeupdate = 0;
     arenaintermission = 0;
     bool noflags = (m_ctf || m_ktf) && (!numflagspawn[0] || !numflagspawn[1]);
     if(*clientmap) conoutf(_("game mode is \"%s\"%s"), modestr(gamemode, modeacronyms > 0), noflags ? " - \f2but there are no flag bases on this map" : "");