Merge branch 'master' into terencehill/insta_notifications

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / mapvoting.qc

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index ddd20c7cf06da738c4e7d6c292f15e31fd3b55d0..a354bacf28d9ecbec0b259bb5055f2989c889a98 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -23,7 +23,7 @@ float mv_mouse_selection;
 float mv_selection_keyboard;
 
 float gametypevote;
-string mapvote_choosenmap;
+string mapvote_chosenmap;
 vector gtv_text_size;
 vector gtv_text_size_small;
 
@@ -320,10 +320,10 @@ void MapVote_Draw()
        drawstring(pos, map, '24 24 0', '1 1 1', 1, DRAWFLAG_NORMAL);
        pos_y += 26;
 
-       if(gametypevote && mapvote_choosenmap != "" )
+       if( mapvote_chosenmap != "" )
        {
-               pos_x = center - stringwidth(mapvote_choosenmap, false, hud_fontsize);
-               drawstring(pos, mapvote_choosenmap, hud_fontsize*2, '1 1 1', 1, DRAWFLAG_NORMAL);
+               pos_x = center - stringwidth(mapvote_chosenmap, false, hud_fontsize*1.5/2);
+               drawstring(pos, mapvote_chosenmap, hud_fontsize*1.5, '1 1 1', 1, DRAWFLAG_NORMAL);
                pos_y += hud_fontsize_y*2;
        }
 
@@ -535,9 +535,10 @@ void MapVote_Init()
 
        if(gametypevote)
        {
-               // read map name in case we have nextmap set
-               mapvote_choosenmap = strzone(ReadString());
-        
+               mapvote_chosenmap = strzone(ReadString());
+               if ( gametypevote == 2 )
+                       gametypevote = 0;
+
                gtv_text_size = hud_fontsize*1.4;
                gtv_text_size_small = hud_fontsize*1.1;