From: terencehill <piuntn@gmail.com>
Date: Wed, 15 Dec 2010 23:09:08 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/newpanelhud
X-Git-Tag: xonotic-v0.5.0~356
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=532bc664cec406e76fa496f8f0c682df17c27ff3;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/newpanelhud

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

532bc664cec406e76fa496f8f0c682df17c27ff3
diff --cc qcsrc/client/hud.qc
index 51015fe6a,476eb607e..0910c7a78
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -3573,9 -3591,12 +3574,9 @@@ void HUD_Radar(void
  		  f * bigsize
  		+ (1 - f) * normalsize;
  	teamradar_origin3d_in_texcoord = teamradar_3dcoord_to_texcoord(
- 		  f * (mi_min + mi_max) * 0.5
+ 		  f * mi_center
  		+ (1 - f) * view_origin);
  
 -	color1 = GetPlayerColor(player_localentnum-1);
 -	rgb = GetTeamRGB(color1);
 -
  	drawsetcliparea(
  		pos_x,
  		pos_y,
diff --cc qcsrc/client/scoreboard.qc
index 089668974,31cdc45bf..7de456043
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@@ -883,8 -883,10 +883,10 @@@ float HUD_WouldDrawScoreboard() 
  		return 1;
  	else if (intermission == 1)
  		return 1;
- 	else if (spectatee_status != -1 && getstati(STAT_HEALTH) <= 0 && autocvar_cl_deathscoreboard)
 -	else if (getstati(STAT_HEALTH) <= 0 && autocvar_cl_deathscoreboard && gametype != GAME_CTS)
++	else if (spectatee_status != -1 && getstati(STAT_HEALTH) <= 0 && autocvar_cl_deathscoreboard && gametype != GAME_CTS)
  		return 1;
+     else if (spectatee_status == -1)
+         return 1;
  	else if (scoreboard_showscores_force)
  		return 1;
  	return 0;