From: terencehill <piuntn@gmail.com>
Date: Sat, 19 Mar 2011 22:57:17 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/newpanelhud
X-Git-Tag: xonotic-v0.5.0~309
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=9cdc5ecff03fff6fe2feef2341a33806aa110a97

Merge branch 'master' into terencehill/newpanelhud

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

9cdc5ecff03fff6fe2feef2341a33806aa110a97
diff --cc qcsrc/client/hud.qc
index 177a7cb985,1053c5e5ff..9252d5b596
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -2972,21 -3888,16 +2972,21 @@@ void HUD_VoteWindow(void
  	if(autocvar_cl_allow_uid2name == -1 && (gametype == GAME_CTS || gametype == GAME_RACE))
  	{
  		vote_active = 1;
 +		if (autocvar__hud_configure)
 +		{
 +			vote_yescount = 0;
 +			vote_nocount = 0;
 +			print(_("^1You must answer before entering hud configure mode\n"));
 +			cvar_set("_hud_configure", "0");
 +		}
- 		vote_called_vote = strzone(_("^2Name ^7instead of \"^1Unregistered player\" ^7in stats"));
+ 		vote_called_vote = strzone(_("^2Name ^7instead of \"^1Unregistered player^7\" in stats"));
 -        uid2name_dialog = 1;
 +		uid2name_dialog = 1;
  	}
  
 -	if(!autocvar_hud_panel_vote && !autocvar__hud_configure)
 -		return;
 -
  	if(!autocvar__hud_configure)
  	{
 +		if(!autocvar_hud_panel_vote) return;
 +
  		panel_fg_alpha = autocvar_hud_panel_fg_alpha;
  		panel_bg_alpha_str = autocvar_hud_panel_vote_bg_alpha;