X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmapvoting.qc;h=87b6d585b38c769cd8d20d65d0be24ad3303d52d;hb=refs%2Fheads%2FTimePath%2Fdefault-eraseable;hp=bfc25e99c134116524b39fe0934773484e1627f7;hpb=b9671f63469586007314131f3f53728795c035cd;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc index bfc25e99c..87b6d585b 100644 --- a/qcsrc/client/mapvoting.qc +++ b/qcsrc/client/mapvoting.qc @@ -1,7 +1,10 @@ #include "mapvoting.qh" -#include "hud/all.qh" -#include "scoreboard.qh" +#include "autocvars.qh" +#include "miscfunctions.qh" +#include "defs.qh" +#include "hud/_mod.qh" +#include "hud/panel/scoreboard.qh" #include @@ -24,7 +27,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; @@ -84,14 +86,15 @@ void GameTypeVote_DrawGameTypeItem(vector pos, float maxh, float tsize, string g 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; - pos.x += rect_margin + autocvar_scoreboard_border_thickness; - pos.y += rect_margin + autocvar_scoreboard_border_thickness; - maxh -= 2 * (rect_margin + autocvar_scoreboard_border_thickness); - tsize -= 2 * (rect_margin + autocvar_scoreboard_border_thickness); + pos.x += rect_margin + autocvar_hud_panel_mapvote_highlight_border; + pos.y += rect_margin + autocvar_hud_panel_mapvote_highlight_border; + maxh -= 2 * (rect_margin + autocvar_hud_panel_mapvote_highlight_border); + tsize -= 2 * (rect_margin + autocvar_hud_panel_mapvote_highlight_border); vector rect_pos = pos - '0.5 0.5 0' * rect_margin; vector rect_size = '1 1 0'; @@ -101,15 +104,15 @@ void GameTypeVote_DrawGameTypeItem(vector pos, float maxh, float tsize, string g // 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); - drawborderlines(autocvar_scoreboard_border_thickness, rect_pos, rect_size, rgb, 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); } vector offset = pos; @@ -177,11 +180,11 @@ void GameTypeVote_DrawGameTypeItem(vector pos, float maxh, float tsize, string g drawstring(last.origin+offset, last.message, gtv_text_size_small, '1 1 1', alpha, DRAWFLAG_NORMAL); next = last; last = last.chain; - remove(next); + delete(next); } // Cleanup - remove(title); + delete(title); } void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, string pic, float _count, int id) @@ -193,10 +196,10 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin float rect_margin = hud_fontsize.y / 2; - pos.x += rect_margin + autocvar_scoreboard_border_thickness; - pos.y += rect_margin + autocvar_scoreboard_border_thickness; - isize -= 2 * (rect_margin + autocvar_scoreboard_border_thickness); - tsize -= 2 * (rect_margin + autocvar_scoreboard_border_thickness); + pos.x += rect_margin + autocvar_hud_panel_mapvote_highlight_border; + pos.y += rect_margin + autocvar_hud_panel_mapvote_highlight_border; + isize -= 2 * (rect_margin + autocvar_hud_panel_mapvote_highlight_border); + tsize -= 2 * (rect_margin + autocvar_hud_panel_mapvote_highlight_border); vector rect_pos = pos - '0.5 0.5 0' * rect_margin; vector rect_size = '1 1 0'; @@ -230,17 +233,18 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin 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); - drawborderlines(autocvar_scoreboard_border_thickness, rect_pos, rect_size, rgb, 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); } drawstring(text_pos, label, hud_fontsize, rgb, theAlpha, DRAWFLAG_NORMAL); @@ -272,7 +276,7 @@ void MapVote_DrawAbstain(vector pos, float isize, float tsize, float _count, int 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) @@ -295,10 +299,10 @@ float MapVote_Selection(vector topleft, vector cellsize, float rows, float colum 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; @@ -332,15 +336,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 +367,14 @@ void MapVote_Draw() 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,12 +384,10 @@ void MapVote_Draw() 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; @@ -400,7 +401,7 @@ void MapVote_Draw() // higher than the image itself ratio for mapvote items to reserve space for long map names int item_aspect = (gametypevote) ? 3/1 : 5/3; - vector table_size = HUD_GetTableSize_BestItemAR(mv_num_maps, eX * (xmax - xmin) + eY * (ymax - ymin), item_aspect); + vector table_size = HUD_GetTableSize_BestItemAR(mv_num_maps, vec2(xmax - xmin, ymax - ymin), item_aspect); mv_columns = table_size.x; rows = table_size.y; @@ -440,7 +441,7 @@ void MapVote_Draw() 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) { @@ -486,7 +487,7 @@ void MapVote_Draw() 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) @@ -496,7 +497,7 @@ void Cmd_MapVote_MapDownload(int argc) if(argc != 2 || !mv_pk3list) { - LOG_INFO(_("mv_mapdownload: ^3You're not supposed to use this command on your own!\n")); + LOG_INFO(_("mv_mapdownload: ^3You're not supposed to use this command on your own!")); return; } @@ -506,7 +507,7 @@ void Cmd_MapVote_MapDownload(int argc) break; if(!pak || pak.sv_entnum != id) { - LOG_INFO(_("^1Error:^7 Couldn't find pak index.\n")); + LOG_INFO(_("^1Error:^7 Couldn't find pak index.")); return; } @@ -515,7 +516,7 @@ void Cmd_MapVote_MapDownload(int argc) mv_preview[id] = true; return; } else { - LOG_INFO(_("Requesting preview...\n")); + LOG_INFO(_("Requesting preview...")); localcmd(strcat("\ncmd mv_getpicture ", ftos(id), "\n")); } } @@ -562,7 +563,7 @@ void MapVote_ReadMask() int i; if ( mv_num_maps < 24 ) { - int mask, power; + int mask; if(mv_num_maps < 8) mask = ReadByte(); else if(mv_num_maps < 16) @@ -570,9 +571,9 @@ void MapVote_ReadMask() else mask = ReadLong(); - for(i = 0, power = 1; i < mv_num_maps; ++i, power *= 2) + for(i = 0; i < mv_num_maps; ++i) { - if ( mask & power ) + if (mask & BIT(i)) mv_flags[i] |= GTV_AVAILABLE; else mv_flags[i] &= ~GTV_AVAILABLE; @@ -610,12 +611,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 ) { @@ -624,20 +620,38 @@ void GameTypeVote_ReadOption(int i) name = gt; mv_pk3[i] = strzone(name); mv_desc[i] = strzone(ReadString()); + basetype = strzone(ReadString()); } else { - int type = MapInfo_Type_FromString(gt); + Gametype type = MapInfo_Type_FromString(gt); 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; @@ -773,8 +787,8 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary) if(bInputType == 3) { - mv_mousepos.x = nPrimary; - mv_mousepos.y = nSecondary; + mousepos.x = nPrimary; + mousepos.y = nSecondary; mv_selection_keyboard = 0; return true; }