From: Ant Zucaro Date: Sat, 9 Feb 2013 01:09:56 +0000 (-0500) Subject: On second thought, don't X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a19e8093c6f6e7c3b1a25fc45e957b428aa8a8f0;p=xonotic%2Fxonstat.git On second thought, don't --- diff --git a/xonstat/templates/scoreboard.mako b/xonstat/templates/scoreboard.mako index 2f0672c..0648ee3 100644 --- a/xonstat/templates/scoreboard.mako +++ b/xonstat/templates/scoreboard.mako @@ -104,7 +104,6 @@ ${scoreboard_header(game_type_cd, pgstats[0])} Ping % endif Fastest Time - Deaths % endif @@ -269,7 +268,6 @@ ${scoreboard_header(game_type_cd, pgstats[0])} % else: - % endif - ${pgstat.deaths} % endif % if game_type_cd == 'ctf': diff --git a/xonstat/views/submission.py b/xonstat/views/submission.py index 95f83fe..fd70934 100644 --- 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) if key == 'scoreboard-score': pgstat.score = int(round(float(value))) if key == 'scoreboard-deaths': pgstat.deaths = int(value) - if key == 'scoreboard-kills': - if game_type_cd != 'cts': - pgstat.kills = int(value) + if key == 'scoreboard-kills': pgstat.kills = int(value) if key == 'scoreboard-suicides': pgstat.suicides = int(value) if key == 'scoreboard-objectives': pgstat.collects = int(value) if key == 'scoreboard-captured': pgstat.captures = int(value)