Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Sat, 19 Mar 2011 22:57:17 +0000 (23:57 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 19 Mar 2011 22:57:17 +0000 (23:57 +0100)
Conflicts:
qcsrc/client/hud.qc

1  2 
defaultXonotic.cfg
qcsrc/client/Defs.qc
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc
tooltips.db

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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;
-               vote_called_vote = strzone(_("^2Name ^7instead of \"^1Unregistered player\" ^7in stats"));
 +              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");
 +              }
 -        uid2name_dialog = 1;
+               vote_called_vote = strzone(_("^2Name ^7instead of \"^1Unregistered player^7\" in stats"));
 +              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;
  
Simple merge
Simple merge
diff --cc tooltips.db
Simple merge