From: terencehill <piuntn@gmail.com>
Date: Sat, 18 Dec 2010 01:00:58 +0000 (+0100)
Subject: Merge remote branch 'remotes/origin/terencehill/newpanelhud' into terencehill/newpanelhud
X-Git-Tag: xonotic-v0.5.0~348
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a348133f389bded7a6a09d114ef2e764690c68ac;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'remotes/origin/terencehill/newpanelhud' into terencehill/newpanelhud
---

a348133f389bded7a6a09d114ef2e764690c68ac
diff --cc qcsrc/client/hud.qc
index ff15da526,0551fd284..1504a0388
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -3610,10 -3624,9 +3616,10 @@@ void HUD_Score(void
  	if(!autocvar__hud_configure)
  	{
  		if(!autocvar_hud_panel_score) return;
 +		if(spectatee_status == -1 && (gametype == GAME_RACE || gametype == GAME_CTS)) return;
  	}
- 	else
- 		hud_configure_active_panel = HUD_PANEL_SCORE;
+ 
+     hud_configure_active_panel = HUD_PANEL_SCORE;
  
  	HUD_Panel_UpdateCvars(score);
  	vector pos, mySize;
@@@ -5174,10 -5286,9 +5280,10 @@@ void HUD_Physics(void
  	if(!autocvar_hud_panel_physics)
  	{
  		if(!autocvar__hud_configure) return;
 +		if(spectatee_status <= 0 && autocvar_hud_panel_physics < 2) return;
  	}
- 	else
- 		hud_configure_active_panel = HUD_PANEL_PHYSICS;
+ 
+     hud_configure_active_panel = HUD_PANEL_PHYSICS;
  
  	HUD_Panel_UpdateCvars(physics);