From 711e076df0aa53dad690fb98c3b5149287127ad0 Mon Sep 17 00:00:00 2001
From: flowtron <flowtron@users.sourceforge.net>
Date: Mon, 4 Oct 2010 20:40:39 +0000
Subject: [PATCH] SV_TIMEUP now sends gamemillis, gamelimit - client can draw a
 hud-clock

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5709 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/renderhud.cpp | 20 ++++++++++++++++++++
 source/src/server.cpp    | 14 ++++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp
index 94f76380..b8b9ceb5 100644
--- a/source/src/renderhud.cpp
+++ b/source/src/renderhud.cpp
@@ -682,6 +682,7 @@ void drawscores()
     glPopAttrib();
 }
 
+VARP(clockdisplay,0,0,2);
 VARP(dbgpos,0,0,1);
 void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwater)
 {
@@ -842,6 +843,25 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
             draw_text(c_val, VIRTW*2 - ( text_width(c_val) + FONTH ), VIRTH*2 - 3*FONTH/2);
         }
     }
+    if(!intermission && clockdisplay!=0)
+    {
+        string gtime;
+        int cssec = (gametimecurrent+(lastmillis-lastgametimeupdate))/1000;
+        int gtsec = cssec%60;
+        int gtmin = cssec/60;
+        if(clockdisplay==1)
+        {
+            int gtmax = gametimemaximum/60000;
+            gtmin = gtmax - gtmin;
+            if(gtsec!=0)
+            {
+                gtmin -= 1;
+                gtsec = 60 - gtsec;
+            }
+        }
+        formatstring(gtime)("%02d:%02d", gtmin, gtsec);
+        draw_text(gtime, (2*VIRTW - text_width(gtime))/2, 2);
+    }
 
     if(hidevote < 2 && multiplayer(false))
     {
diff --git a/source/src/server.cpp b/source/src/server.cpp
index cd3f2d6a..13be76e9 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -1303,7 +1303,7 @@ void serverdamage(client *target, client *actor, int damage, int gun, bool gib,
     clientstate &ts = target->state;
     ts.dodamage(damage);
     actor->state.damage += damage != 1000 ? damage : 0;
-    sendf(-1, 1, "ri6", gib ? SV_GIBDAMAGE : SV_DAMAGE, target->clientnum, actor->clientnum, damage, ts.armour, ts.health);
+    sendf(-1, 1, "ri7", gib ? SV_GIBDAMAGE : SV_DAMAGE, target->clientnum, actor->clientnum, gun, damage, ts.armour, ts.health);
     if(target!=actor){
         checkcombo (target, actor, damage, gun);
         if(!hitpush.iszero())
@@ -1811,7 +1811,7 @@ void startgame(const char *newname, int newmode, int newtime, bool notify)
         {
             // change map
             sendf(-1, 1, "risiii", SV_MAPCHANGE, smapname, smode, mapbuffer.available(), mapbuffer.revision);
-            if(smode>1 || (smode==0 && numnonlocalclients()>0)) sendf(-1, 1, "ri2", SV_TIMEUP, minremain);
+            if(smode>1 || (smode==0 && numnonlocalclients()>0)) sendf(-1, 1, "ri3", SV_TIMEUP, gamemillis, gamelimit);
         }
         packetbuf q(MAXTRANS, ENET_PACKET_FLAG_RELIABLE);
         send_item_list(q); // always send the item list when a game starts
@@ -2348,7 +2348,9 @@ void welcomepacket(packetbuf &p, int n)
         if(smode>1 || (smode==0 && numnonlocalclients()>0))
         {
             putint(p, SV_TIMEUP);
-            putint(p, minremain);
+            putint(p, (gamemillis>=gamelimit || forceintermission) ? gamelimit : gamemillis);
+            putint(p, gamelimit);
+            //putint(p, minremain*60);
         }
         send_item_list(p); // this includes the flags
     }
@@ -3388,7 +3390,7 @@ void checkintermission()
     if(minremain>0)
     {
         minremain = (gamemillis>=gamelimit || forceintermission) ? 0 : (gamelimit - gamemillis + 60000 - 1)/60000;
-        sendf(-1, 1, "ri2", SV_TIMEUP, minremain);
+        sendf(-1, 1, "ri3", SV_TIMEUP, (gamemillis>=gamelimit || forceintermission) ? gamelimit : gamemillis, gamelimit);
     }
     if(!interm && minremain<=0) interm = gamemillis+10000;
     forceintermission = false;
@@ -3812,7 +3814,7 @@ void extinfo_teamscorebuf(ucharbuf &p)
 {
     putint(p, m_teammode ? EXT_ERROR_NONE : EXT_ERROR);
     putint(p, gamemode);
-    putint(p, minremain);
+    putint(p, minremain); // possible TODO: use gamemillis, gamelimit here too?
     if(!m_teammode) return;
 
     int teamsizes[TEAM_NUM] = { 0 }, fragscores[TEAM_NUM] = { 0 }, flagscores[TEAM_NUM] = { 0 };
@@ -3854,7 +3856,7 @@ void localconnect()
 void processmasterinput(const char *cmd, int cmdlen, const char *args)
 {
 // AUTH WiP
-    uint id; 
+    uint id;
     string val;
     if(sscanf(cmd, "failauth %u", &id) == 1) authfailed(id);
     else if(sscanf(cmd, "succauth %u", &id) == 1) authsucceeded(id);