From: Mario <mario@smbclan.net>
Date: Sun, 3 Jul 2016 23:14:52 +0000 (+1000)
Subject: Merge remote-tracking branch 'origin/Mario/tweaks'
X-Git-Tag: xonotic-v0.8.2~700^2~102
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=f551090a70789701ca1f042746917295b3237bff;hp=-c

Merge remote-tracking branch 'origin/Mario/tweaks'
---

f551090a70789701ca1f042746917295b3237bff
diff --combined qcsrc/server/cl_client.qc
index f23cb8b5c1,b10ea960c5..d813391bd6
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -802,7 -802,7 +802,7 @@@ void ClientKill_Now(entity this
  	if(this.killindicator_teamchange)
  		ClientKill_Now_TeamChange(this);
  
- 	if(IS_PLAYER(this))
+ 	if(!IS_SPEC(this) && !IS_OBSERVER(this))
  		Damage(this, this, this, 100000, DEATH_KILL.m_id, this.origin, '0 0 0');
  
  	// now I am sure the player IS dead
@@@ -905,7 -905,7 +905,7 @@@ void ClientKill_TeamChange (entity this
  				setorigin(it.killindicator, '0 0 52');
  				setthink(it.killindicator, KillIndicator_Think);
  				it.killindicator.nextthink = starttime + (it.lip) * 0.05;
- 				clientkilltime = max(clientkilltime, it.killindicator.nextthink + 0.05);
+ 				//clientkilltime = max(clientkilltime, it.killindicator.nextthink + 0.05);
  				it.killindicator.cnt = ceil(killtime);
  			});
  			this.lip = 0;
@@@ -1735,6 -1735,7 +1735,6 @@@ bool SpectatePrev(entity this
  		    ent = M_ARGV(1, entity);
  		    break;
  		case MUT_SPECPREV_RETURN:
 -		    ent = M_ARGV(1, entity);
  		    return true;
  		case MUT_SPECPREV_CONTINUE:
  		default:
@@@ -2387,7 -2388,7 +2387,7 @@@ void DrownPlayer(entity this
  	if(IS_DEAD(this))
  		return;
  
 -	if (this.waterlevel != WATERLEVEL_SUBMERGED)
 +	if (this.waterlevel != WATERLEVEL_SUBMERGED || this.vehicle)
  	{
  		if(this.air_finished < time)
  			PlayerSound(this, playersound_gasp, CH_PLAYER, VOICETYPE_PLAYERSOUND);