From: Mario <mario.mario@y7mail.com>
Date: Fri, 20 Dec 2013 01:19:34 +0000 (+1100)
Subject: Merge branch 'master' into Mario/showspecs
X-Git-Tag: xonotic-v0.8.2~750^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1649a77da3e957dbc722f2eb3af636725bb00a81;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/showspecs
---

1649a77da3e957dbc722f2eb3af636725bb00a81
diff --cc qcsrc/server/cl_client.qc
index a61a2a53e,d803602ad..b7ca56b84
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1773,11 -1766,8 +1773,11 @@@ float SpectateUpdate() 
  	if (self == self.enemy)
  		return 0;
  
- 	if not(IS_PLAYER(self.enemy))
+ 	if (!IS_PLAYER(self.enemy))
 +	{
 +		self.enemy = world;
  		return 0;
 +	}
  
  	SpectateCopy(self.enemy);