Merge branch 'DefaultUser/gametype_votescreen' into 'master'

Gametype Votescreen: Fix icons for custom gamemodes and add option for custom icons

See merge request !359

diff --combined qcsrc/client/mapvoting.qc
index b497b56bc6e2d6730f4e1079b9537b870250914c,57daed8eb1f396840e247ff82c778a1793566a62..7b07b680057196bb325bda90f4d4dd03fd8866a3
--- 1/qcsrc/client/mapvoting.qc
--- 2/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@@ -1,6 -1,6 +1,6 @@@
  #include "mapvoting.qh"
  
 -#include "hud/all.qh"
 +#include "hud/_mod.qh"
  #include "hud/panel/scoreboard.qh"
  
  #include <common/mapinfo.qh>
@@@ -24,6 -24,7 +24,6 @@@ float mv_timeout
  float mv_top2_time;
  float mv_top2_alpha;
  
 -vector mv_mousepos;
  int mv_selection;
  int mv_columns;
  int mv_mouse_selection;
@@@ -83,7 -84,6 +83,7 @@@ void GameTypeVote_DrawGameTypeItem(vect
                alpha = mv_top2_alpha; // Fade away if not one of the top 2 choice
        else
                alpha = 1; // Normal, full alpha
 +      alpha *= panel_fg_alpha;
  
        // Bounding box details
        float rect_margin = hud_fontsize.y / 2;
@@@ -101,14 -101,14 +101,14 @@@
        // Highlight selected item
        if(id == mv_selection && (mv_flags[id] & GTV_AVAILABLE))
        {
 -              drawfill(rect_pos, rect_size, '1 1 1', 0.1, DRAWFLAG_NORMAL);
 +              drawfill(rect_pos, rect_size, '1 1 1', 0.1 * panel_fg_alpha, DRAWFLAG_NORMAL);
        }
  
        // Highlight current vote
        vector rgb = MapVote_RGB(id);
        if(id == mv_ownvote)
        {
 -              drawfill(rect_pos, rect_size, rgb, 0.1*alpha, DRAWFLAG_NORMAL);
 +              drawfill(rect_pos, rect_size, rgb, 0.1 * alpha, DRAWFLAG_NORMAL);
                drawborderlines(autocvar_hud_panel_mapvote_highlight_border, rect_pos, rect_size, rgb, alpha, DRAWFLAG_NORMAL);
        }
  
@@@ -230,17 -230,16 +230,17 @@@ void MapVote_DrawMapItem(vector pos, fl
                theAlpha = mv_top2_alpha;
        else
                theAlpha = 1;
 +      theAlpha *= panel_fg_alpha;
  
        // Highlight selected item
        if(id == mv_selection && (mv_flags[id] & GTV_AVAILABLE))
 -              drawfill(rect_pos, rect_size, '1 1 1', 0.1, DRAWFLAG_NORMAL);
 +              drawfill(rect_pos, rect_size, '1 1 1', 0.1 * panel_fg_alpha, DRAWFLAG_NORMAL);
  
        // Highlight current vote
        vector rgb = MapVote_RGB(id);
        if(id == mv_ownvote)
        {
 -              drawfill(rect_pos, rect_size, rgb, 0.1*theAlpha, DRAWFLAG_NORMAL);
 +              drawfill(rect_pos, rect_size, rgb, 0.1 * theAlpha, DRAWFLAG_NORMAL);
                drawborderlines(autocvar_hud_panel_mapvote_highlight_border, rect_pos, rect_size, rgb, theAlpha, DRAWFLAG_NORMAL);
        }
  
@@@ -273,7 -272,7 +273,7 @@@ void MapVote_DrawAbstain(vector pos, fl
        text_size = stringwidth(label, false, hud_fontsize);
  
        pos.x -= text_size*0.5;
 -      drawstring(pos, label, hud_fontsize, rgb, 1, DRAWFLAG_NORMAL);
 +      drawstring(pos, label, hud_fontsize, rgb, panel_fg_alpha, DRAWFLAG_NORMAL);
  }
  
  vector MapVote_GridVec(vector gridspec, int i, int m)
@@@ -296,10 -295,10 +296,10 @@@ float MapVote_Selection(vector topleft
        for (r = 0; r < rows; ++r)
                for (c = 0; c < columns; ++c)
                {
 -                      if (mv_mousepos.x >= topleft.x + cellsize.x *  c &&
 -                              mv_mousepos.x <= topleft.x + cellsize.x * (c + 1) &&
 -                              mv_mousepos.y >= topleft.y + cellsize.y *  r &&
 -                              mv_mousepos.y <= topleft.y + cellsize.y * (r + 1))
 +                      if (mousepos.x >= topleft.x + cellsize.x *  c &&
 +                              mousepos.x <= topleft.x + cellsize.x * (c + 1) &&
 +                              mousepos.y >= topleft.y + cellsize.y *  r &&
 +                              mousepos.y <= topleft.y + cellsize.y * (r + 1))
                        {
                                mv_mouse_selection = r * columns + c;
                                break;
@@@ -333,14 -332,15 +333,14 @@@ void MapVote_Draw(
        if(!mv_active)
                return;
  
 +      HUD_Panel_LoadCvars();
 +
        if (!autocvar_hud_cursormode)
        {
 -              vector mpos = mv_mousepos + getmousepos();
 -              mpos.x = bound(0, mpos.x, vid_conwidth);
 -              mpos.y = bound(0, mpos.y, vid_conheight);
 -
 -              if ( mpos.x != mv_mousepos.x || mpos.y != mv_mousepos.y )
 +              vector mpos = mousepos;
 +              update_mousepos();
 +              if (mpos.x != mousepos.x || mpos.y != mousepos.y)
                        mv_selection_keyboard = 0;
 -              mv_mousepos = mpos;
        }
  
        center = (vid_conwidth - 1)/2;
@@@ -364,14 -364,14 +364,14 @@@
  
        map = ((gametypevote) ? _("Decide the gametype") : _("Vote for a map"));
        pos.x = center - stringwidth(map, false, hud_fontsize * 2) * 0.5;
 -      drawstring(pos, map, hud_fontsize * 2, '1 1 1', 1, DRAWFLAG_NORMAL);
 +      drawstring(pos, map, hud_fontsize * 2, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
        pos.y += hud_fontsize.y * 2;
  
        if( mapvote_chosenmap != "" )
        {
                pos.y += hud_fontsize.y * 0.25;
                pos.x = center - stringwidth(mapvote_chosenmap, false, hud_fontsize * 1.5) * 0.5;
 -              drawstring(pos, mapvote_chosenmap, hud_fontsize * 1.5, '1 1 1', 1, DRAWFLAG_NORMAL);
 +              drawstring(pos, mapvote_chosenmap, hud_fontsize * 1.5, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
                pos.y += hud_fontsize.y * 1.5;
        }
        pos.y += hud_fontsize.y * 0.5;
@@@ -381,10 -381,12 +381,10 @@@
        i = ceil(max(0, mv_timeout - time));
        map = sprintf(_("%d seconds left"), i);
        pos.x = center - stringwidth(map, false, hud_fontsize * 1.5) * 0.5;
 -      drawstring(pos, map, hud_fontsize * 1.5, '0 1 0', 1, DRAWFLAG_NORMAL);
 +      drawstring(pos, map, hud_fontsize * 1.5, '0 1 0', panel_fg_alpha, DRAWFLAG_NORMAL);
        pos.y += hud_fontsize.y * 1.5;
        pos.y += hud_fontsize.y * 0.5;
  
 -      HUD_Panel_UpdateCvars();
 -
        // base for multi-column stuff...
        pos.y += hud_fontsize.y;
        pos.x = xmin;
@@@ -438,7 -440,7 +438,7 @@@
        panel_pos.y = pos.y;
        panel_size.x = xmax - xmin;
        panel_size.y = ymax - ymin;
 -      HUD_Panel_DrawBg(1);
 +      HUD_Panel_DrawBg();
  
        if(panel_bg_padding)
        {
@@@ -484,7 -486,7 +484,7 @@@
                MapVote_DrawAbstain(pos, dist.x, xmax - xmin, tmp, i);
        }
  
 -      draw_cursor_normal(mv_mousepos, '1 1 1', 1 - autocvar__menu_alpha);
 +      draw_cursor_normal(mousepos, '1 1 1', panel_fg_alpha);
  }
  
  void Cmd_MapVote_MapDownload(int argc)
@@@ -608,12 -610,7 +608,7 @@@ void GameTypeVote_ReadOption(int i
        mv_maps[i] = gt;
        mv_flags[i] = ReadByte();
  
-       string mv_picpath = sprintf("gfx/menu/%s/gametype_%s", autocvar_menu_skin, gt);
-       if(precache_pic(mv_picpath) == "")
-               mv_picpath = strcat("gfx/menu/default/gametype_", gt);
-       string pic = strzone(mv_picpath);
-       mv_pics[i] = pic;
-       mv_preview[i] = PreviewExists(pic);
+       string basetype = "";
  
        if ( mv_flags[i] & GTV_CUSTOM )
        {
@@@ -622,6 -619,7 +617,7 @@@
                        name = gt;
                mv_pk3[i] = strzone(name);
                mv_desc[i] = strzone(ReadString());
+               basetype = strzone(ReadString());
        }
        else
        {
@@@ -629,13 -627,30 +625,30 @@@
                mv_pk3[i] = strzone(MapInfo_Type_ToText(type));
                mv_desc[i] = MapInfo_Type_Description(type);
        }
+ 
+       string mv_picpath = sprintf("gfx/menu/%s/gametype_%s", autocvar_menu_skin, gt);
+       if(precache_pic(mv_picpath) == "")
+       {
+               mv_picpath = strcat("gfx/menu/default/gametype_", gt);
+               if(precache_pic(mv_picpath) == "")
+               {
+                       mv_picpath = sprintf("gfx/menu/%s/gametype_%s", autocvar_menu_skin, basetype);
+                       if(precache_pic(mv_picpath) == "")
+                       {
+                               mv_picpath = strcat("gfx/menu/default/gametype_", basetype);
+                       }
+               }
+       }
+       string pic = strzone(mv_picpath);
+       mv_pics[i] = pic;
+       mv_preview[i] = PreviewExists(pic);
  }
  
  void MapVote_Init()
  {
        mv_active = 1;
 -      if(autocvar_hud_cursormode) { setcursormode(1); }
 -      else { mv_mousepos = '0.5 0 0' * vid_conwidth + '0 0.5 0' * vid_conheight; }
 +      if(autocvar_hud_cursormode) setcursormode(1);
 +      else mousepos = '0.5 0 0' * vid_conwidth + '0 0.5 0' * vid_conheight;
        mv_selection = -1;
        mv_selection_keyboard = 0;
  
@@@ -771,8 -786,8 +784,8 @@@ float MapVote_InputEvent(int bInputType
  
        if(bInputType == 3)
        {
 -              mv_mousepos.x = nPrimary;
 -              mv_mousepos.y = nSecondary;
 +              mousepos.x = nPrimary;
 +              mousepos.y = nSecondary;
                mv_selection_keyboard = 0;
                return true;
        }