From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 4 Dec 2011 15:37:25 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/csqcmodel
X-Git-Tag: xonotic-v0.6.0~74^2~100^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=69ce389c2d8428de35bc392b7aa38b121632ca6c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into divVerent/csqcmodel

Conflicts:
	qcsrc/client/View.qc
---

69ce389c2d8428de35bc392b7aa38b121632ca6c
diff --cc qcsrc/client/View.qc
index f8e054df8,d9f6df7ee..ac2f12cb5
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -407,8 -408,7 +408,9 @@@ void CSQC_UpdateView(float w, float h
  
  	WaypointSprite_Load();
  
 +	CSQCPlayer_SetCamera();
 +
+ #ifdef COMPAT_XON050_ENGINE
  	if(spectatee_status)
  		myteam = GetPlayerColor(spectatee_status - 1);
  	else