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

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

9abf8f085ddcfdc7ed88965c6edfa812928c48c8
diff --cc qcsrc/server/cl_client.qc
index 6ac29a7f8,d1720a4d4..fac1c0e57
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1308,19 -1303,19 +1308,19 @@@ void ClientKill_TeamChange (float targe
  	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)
- 	{
- 		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(!self.killindicator)
  	{
+ 		if(self.modelindex && self.deadflag == DEAD_NO)
+ 		{
+ 			killtime = max(killtime, self.clientkill_nexttime - time);
+ 			self.clientkill_nexttime = time + killtime + autocvar_g_balance_kill_antispam;
+ 		}
+ 
  		if(killtime <= 0 || !self.modelindex || self.deadflag != DEAD_NO)
  		{
  			ClientKill_Now();