#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 <common/mapinfo.qh>
float mv_top2_time;
float mv_top2_alpha;
-vector mv_mousepos;
int mv_selection;
int mv_columns;
int mv_mouse_selection;
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';
// 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;
string thelabel = mv_desc[id], ts;
entity last = title;
- entity next = world;
+ entity next = NULL;
float nlines = 0;
if( thelabel != "")
{
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)
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';
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);
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)
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;
return mv_mouse_selection;
}
-vector HUD_GetTableSize_BestItemAR(int item_count, vector psize, float item_aspect);
void MapVote_Draw()
{
string map;
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;
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;
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;
// 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;
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)
{
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)
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;
}
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;
}
mv_preview[id] = true;
return;
} else {
- LOG_INFO(_("Requesting preview...\n"));
+ LOG_INFO(_("Requesting preview..."));
localcmd(strcat("\ncmd mv_getpicture ", ftos(id), "\n"));
}
}
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)
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;
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 )
{
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;
for(i = 0; i < mv_num_maps; ++i )
mv_flags_start[i] = mv_flags[i];
- // Assume mv_pk3list is world, there should only be 1 mapvote per round
- mv_pk3list = world; // I'm still paranoid!
+ // Assume mv_pk3list is NULL, there should only be 1 mapvote per round
+ mv_pk3list = NULL; // I'm still paranoid!
for(i = 0; i < mv_num_maps; ++i)
{
if(bInputType == 3)
{
- mv_mousepos.x = nPrimary;
- mv_mousepos.y = nSecondary;
+ mousepos.x = nPrimary;
+ mousepos.y = nSecondary;
mv_selection_keyboard = 0;
return true;
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff