git wants me to commit, so I will: begin using the improved kill delay code

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 274d5ccdb3a5863ae905184d330338b8d731b0d3..6ac29a7f83d1af4ae2878d08f85e08d9a41252b0 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1308,7 +1308,7 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2
        entity e;
        killtime = autocvar_g_balance_kill_delay;
 
-       if(g_race_qualifying)
+       if(g_race_qualifying || g_cts)
                killtime = 0;
 
        if(self.modelindex && self.deadflag == DEAD_NO)
@@ -1319,15 +1319,6 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2
 
        self.killindicator_teamchange = targetteam;
 
-    if(g_cts) // allow an instant kill in CTS
-    {
-        if(self.selfkilltime < time + 3) // prevent spam
-        {
-            self.selfkilltime = max(time, self.selfkilltime) + 2;
-            ClientKill_Now();
-        }
-        return;
-    }
     if(!self.killindicator)
        {
                if(killtime <= 0 || !self.modelindex || self.deadflag != DEAD_NO)

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 5338a1025efebf01410966a3f2c8e8b6e12a7582..76ce748ca8d93ec1d163d8431a4f4b10f53957ea 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -659,5 +659,3 @@ float serverflags;
 .float freezetag_frozen;
 .float freezetag_beginrevive_time;
 .float freezetag_revive_progress;
-
-.float selfkilltime; // when to allow another selfkill in CTS