Merge branch 'master' into z411/annce_queue

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / gamemodes / gamemode / cts / sv_cts.qc

diff --git a/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc b/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc
index 45457d1a4d8adb895ea40b39e4ad89b458d2b495..56de4a90cf86d9912b532331bfb7ce622996b2e8 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc
+++ b/qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc
@@ -237,9 +237,7 @@ MUTATOR_HOOKFUNCTION(cts, PutClientInServer)
 
 MUTATOR_HOOKFUNCTION(cts, PlayerDamaged)
 {
-       int frag_deathtype = M_ARGV(5, int);
-       if (frag_deathtype == DEATH_KILL.m_id)
-               return true; // forbid logging damage
+       return true; // forbid logging damage
 }
 
 MUTATOR_HOOKFUNCTION(cts, PlayerDies)
@@ -325,7 +323,7 @@ MUTATOR_HOOKFUNCTION(cts, GetRecords)
                                continue;
 
                        string h = race_readName(MapInfo_Map_bspname, 1);
-                       ret_string = strcat(ret_string, strpad(32, MapInfo_Map_bspname), " ", strpad(-8, TIME_ENCODED_TOSTRING(r)), " ", h, "\n");
+                       ret_string = strcat(ret_string, strpad(32, MapInfo_Map_bspname), " ", strpad(-8, TIME_ENCODED_TOSTRING(r, false)), " ", h, "\n");
                }
        }