From 254051b63223cdf024b92ee0c9a4ed148e04ae1a Mon Sep 17 00:00:00 2001 From: FruitieX Date: Sat, 11 Dec 2010 22:02:55 +0200 Subject: [PATCH] git wants me to commit, so I will: begin using the improved kill delay code --- qcsrc/server/cl_client.qc | 11 +---------- qcsrc/server/defs.qh | 2 -- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 274d5ccdb..6ac29a7f8 100644 --- 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 5338a1025..76ce748ca 100644 --- 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 -- 2.39.2