From: FruitieX <fruitiex@gmail.com>
Date: Sat, 11 Dec 2010 19:53:03 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into fruitiex/ctsfix
X-Git-Tag: xonotic-v0.1.0preview~51^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d0168920d1b49c61e7867c7acac8a76fd32dc8e2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into fruitiex/ctsfix
---

d0168920d1b49c61e7867c7acac8a76fd32dc8e2
diff --cc qcsrc/server/cl_client.qc
index fbe98741f,821f51573..274d5ccdb
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1300,18 -1306,15 +1311,24 @@@ void ClientKill_TeamChange (float targe
  	if(g_race_qualifying)
  		killtime = 0;
  
+ 	if(self.modelindex && self.deadflag == DEAD_NO)
+ 	{
+ 		killtime = max(killtime, self.clientkill_nexttime - time);
+ 		self.clientkill_nexttime = time + killtime + autocvar_g_balance_kill_antispam;
+ 	}
+ 
  	self.killindicator_teamchange = targetteam;
  
 -	if(!self.killindicator)
 +    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)
  		{