On second thought, don't

diff --git a/xonstat/templates/scoreboard.mako b/xonstat/templates/scoreboard.mako
index 2f0672c1f21851c6ec4687038f42c03aeb169d09..0648ee36b85f7412a0885e78e39d55048489cc37 100644 (file)
--- a/xonstat/templates/scoreboard.mako
+++ b/xonstat/templates/scoreboard.mako
@@ -104,7 +104,6 @@ ${scoreboard_header(game_type_cd, pgstats[0])}
       <th class="ping">Ping</th>
       % endif
       <th class="fastest">Fastest Time</th>
-      <th class="deaths">Deaths</th>
     </tr>
     </thead>
 % endif
@@ -269,7 +268,6 @@ ${scoreboard_header(game_type_cd, pgstats[0])}
         % else:
         <td>-</td>
         % endif
-        <td>${pgstat.deaths}</td>
 % endif
 
 % if game_type_cd == 'ctf':

diff --git a/xonstat/views/submission.py b/xonstat/views/submission.py
index 95f83fec823e77ba81c47038f951f73b68fd7b0f..fd70934d0d53d8744059b0067b81df7d7b87c764 100644 (file)
--- a/xonstat/views/submission.py
+++ b/xonstat/views/submission.py
@@ -633,9 +633,7 @@ def create_game_stat(session, game_meta, game, server, gmap, player, events):
         if key == 'scoreboard-caps': pgstat.captures = int(value)\r
         if key == 'scoreboard-score': pgstat.score = int(round(float(value)))\r
         if key == 'scoreboard-deaths': pgstat.deaths = int(value)\r
-        if key == 'scoreboard-kills':\r
-            if game_type_cd != 'cts':\r
-                pgstat.kills = int(value)\r
+        if key == 'scoreboard-kills': pgstat.kills = int(value)\r
         if key == 'scoreboard-suicides': pgstat.suicides = int(value)\r
         if key == 'scoreboard-objectives': pgstat.collects = int(value)\r
         if key == 'scoreboard-captured': pgstat.captures = int(value)\r