#include "mapvoting.qh"
-#include "_all.qh"
-#include "hud.qh"
+#include "hud/all.qh"
#include "scoreboard.qh"
-#include "../common/mapinfo.qh"
-#include "../common/util.qh"
-
-#include "../dpdefs/keycodes.qh"
+#include <common/mapinfo.qh>
int mv_num_maps;
-float mv_active;
string mv_maps[MAPVOTE_COUNT];
string mv_pics[MAPVOTE_COUNT];
string mv_pk3[MAPVOTE_COUNT]; // map pk3 name or gametype human readable name
string MapVote_FormatMapItem(int id, string map, float _count, float maxwidth, vector fontsize)
{
+ TC(int, id);
string pre, post;
pre = sprintf("%d. ", id+1);
if(mv_detail)
vector MapVote_RGB(int id)
{
+ TC(int, id);
if(!(mv_flags[id] & GTV_AVAILABLE))
return '1 1 1';
if(id == mv_ownvote)
void GameTypeVote_DrawGameTypeItem(vector pos, float maxh, float tsize, string gtype, string pic, float _count, int id)
{
+ TC(int, id);
// Find the correct alpha
float alpha;
if(!(mv_flags_start[id] & GTV_AVAILABLE))
// Bounding box details
float rect_margin = hud_fontsize.y / 2;
- pos.x += rect_margin;
- pos.y += rect_margin;
- maxh -= 2 * rect_margin;
- tsize -= 2 * rect_margin;
+ 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);
vector rect_pos = pos - '0.5 0.5 0' * rect_margin;
vector rect_size = '1 1 0';
string thelabel = mv_desc[id], ts;
entity last = title;
- entity next = world;
+ entity next = NULL;
float nlines = 0;
if( thelabel != "")
{
void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, string pic, float _count, int id)
{
+ TC(int, id);
vector img_size = '0 0 0';
- vector rgb;
string label;
float text_size;
- rgb = MapVote_RGB(id);
+ float rect_margin = hud_fontsize.y / 2;
- float padding = 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 += padding;
- pos.y += padding;
- isize -= 2 * padding;
- tsize -= 2 * padding;
+ vector rect_pos = pos - '0.5 0.5 0' * rect_margin;
+ vector rect_size = '1 1 0';
+ rect_size.x = tsize + rect_margin;
+ rect_size.y = isize + rect_margin;
float img_ar = 4/3;
img_size.x = min(tsize, isize * img_ar);
img_size.y = img_size.x / img_ar;
- img_size.y -= hud_fontsize.y - autocvar_scoreboard_border_thickness * 2;
+ img_size.y -= hud_fontsize.y;
img_size.x = img_size.y * img_ar;
pos.y += (isize - img_size.y - hud_fontsize.y) / 2;
text_size = stringwidth(label, false, hud_fontsize);
+ float save_rect_sizex = rect_size.x;
+ rect_size.x = max(img_size.x, text_size) + rect_margin;
+ rect_pos.x += (save_rect_sizex - rect_size.x) / 2;
+
vector text_pos = '0 0 0';
text_pos.x = pos.x + (tsize - text_size) / 2;
- text_pos.y = pos.y + img_size.y + autocvar_scoreboard_border_thickness;
+ text_pos.y = pos.y + img_size.y;
pos.x += (tsize - img_size.x) / 2;
theAlpha = mv_top2_alpha;
else
theAlpha = 1;
+
+ // Highlight selected item
+ if(id == mv_selection && (mv_flags[id] & GTV_AVAILABLE))
+ drawfill(rect_pos, rect_size, '1 1 1', 0.1, 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);
+ }
+
drawstring(text_pos, label, hud_fontsize, rgb, theAlpha, DRAWFLAG_NORMAL);
if(pic == "")
else
drawpic(pos, pic, img_size, '1 1 1', theAlpha, DRAWFLAG_NORMAL);
}
-
- if(id == mv_ownvote)
- drawborderlines(autocvar_scoreboard_border_thickness, pos, img_size, rgb, theAlpha, DRAWFLAG_NORMAL);
- else
- drawborderlines(autocvar_scoreboard_border_thickness, pos, img_size, '0 0 0', theAlpha, DRAWFLAG_NORMAL);
-
- if(id == mv_selection && (mv_flags[id] & GTV_AVAILABLE))
- drawfill(pos, img_size, '1 1 1', 0.1, DRAWFLAG_NORMAL);
}
void MapVote_DrawAbstain(vector pos, float isize, float tsize, float _count, int id)
{
+ TC(int, id);
vector rgb;
float text_size;
string label;
vector MapVote_GridVec(vector gridspec, int i, int m)
{
+ TC(int, i); TC(int, m);
int r = i % m;
return
'1 0 0' * (gridspec.x * r)
int i;
float tmp;
vector pos;
- float isize;
float center;
float rows;
- float tsize;
vector dist = '0 0 0';
+ //if(intermission != 2) return;
if(!mv_active)
return;
if ( mpos.x != mv_mousepos.x || mpos.y != mv_mousepos.y )
mv_selection_keyboard = 0;
mv_mousepos = mpos;
-
}
center = (vid_conwidth - 1)/2;
- xmin = vid_conwidth*0.05; // 5% border must suffice
+ xmin = vid_conwidth * 0.08;
xmax = vid_conwidth - xmin;
ymin = 20;
- i = autocvar_con_chatpos; // *autocvar_con_chatsize;
- if(i < 0)
- ymax = vid_conheight + (i - autocvar_con_chat) * autocvar_con_chatsize;
- if(i >= 0 || ymax < (vid_conheight*0.5))
- ymax = vid_conheight - ymin;
+ ymax = vid_conheight - ymin;
+
+ if(chat_posy + chat_sizey / 2 < vid_conheight / 2)
+ ymin += chat_sizey;
+ else
+ ymax -= chat_sizey;
hud_fontsize = HUD_GetFontsize("hud_fontsize");
pos.y = ymin;
pos.z = 0;
+ HUD_Scale_Disable();
draw_beginBoldFont();
+
map = ((gametypevote) ? _("Decide the gametype") : _("Vote for a map"));
- pos.x = center - stringwidth(map, false, '12 0 0');
- drawstring(pos, map, '24 24 0', '1 1 1', 1, DRAWFLAG_NORMAL);
- pos.y += 26;
+ pos.x = center - stringwidth(map, false, hud_fontsize * 2) * 0.5;
+ drawstring(pos, map, hud_fontsize * 2, '1 1 1', 1, DRAWFLAG_NORMAL);
+ pos.y += hud_fontsize.y * 2;
if( mapvote_chosenmap != "" )
{
- 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;
+ 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);
+ pos.y += hud_fontsize.y * 1.5;
}
+ pos.y += hud_fontsize.y * 0.5;
+
+ draw_endBoldFont();
i = ceil(max(0, mv_timeout - time));
map = sprintf(_("%d seconds left"), i);
- pos.x = center - stringwidth(map, false, '8 0 0');
- drawstring(pos, map, '16 16 0', '0 1 0', 1, DRAWFLAG_NORMAL);
- pos.y += 22;
- pos.x = xmin;
- draw_endBoldFont();
+ 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);
+ 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;
ymin = pos.y;
+ float abstain_spacing = panel_bg_border + hud_fontsize.y;
if(mv_abstain)
+ {
mv_num_maps -= 1;
+ ymax -= abstain_spacing;
+ }
// higher than the image itself ratio for mapvote items to reserve space for long map names
int item_aspect = (gametypevote) ? 3/1 : 5/3;
xmin = pos.x += offset;
xmax -= offset;
offset = ((ymax - pos.y) - dist.y * rows) / 2;
- ymin = pos.y += offset;
- ymax -= offset;
+ ymax -= 2 * offset;
- tsize = dist.x;
- isize = dist.y;
+ // override panel_pos and panel_size
+ panel_pos.x = pos.x;
+ panel_pos.y = pos.y;
+ panel_size.x = xmax - xmin;
+ panel_size.y = ymax - ymin;
+ HUD_Panel_DrawBg(1);
+
+ if(panel_bg_padding)
+ {
+ // FIXME item AR gets slightly changed here...
+ // it's rather hard to avoid it at this point
+ dist.x -= 2 * panel_bg_padding / mv_columns;
+ dist.y -= 2 * panel_bg_padding / rows;
+ xmin = pos.x += panel_bg_padding;
+ ymin = pos.y += panel_bg_padding;
+ xmax -= 2 * panel_bg_padding;
+ ymax -= 2 * panel_bg_padding;
+ }
mv_selection = MapVote_Selection(pos, dist, rows, mv_columns);
tmp = mv_votes[i]; // FTEQCC bug: too many array accesses in the function call screw it up
map = mv_maps[i];
if(mv_preview[i])
- DrawItem(pos + MapVote_GridVec(dist, i, mv_columns), isize, tsize, map, mv_pics[i], tmp, i);
+ DrawItem(pos + MapVote_GridVec(dist, i, mv_columns), dist.y, dist.x, map, mv_pics[i], tmp, i);
else
- DrawItem(pos + MapVote_GridVec(dist, i, mv_columns), isize, tsize, map, "", tmp, i);
+ DrawItem(pos + MapVote_GridVec(dist, i, mv_columns), dist.y, dist.x, map, "", tmp, i);
}
if(mv_abstain)
if(mv_abstain && i < mv_num_maps) {
tmp = mv_votes[i];
- pos.y = ymax + 2 * hud_fontsize.y;
+ pos.y = ymax + abstain_spacing;
pos.x = (xmax+xmin)*0.5;
- MapVote_DrawAbstain(pos, isize, xmax - xmin, tmp, i);
+ MapVote_DrawAbstain(pos, dist.x, xmax - xmin, tmp, i);
}
- drawpic(mv_mousepos, strcat("gfx/menu/", autocvar_menu_skin, "/cursor.tga"), '32 32 0', '1 1 1', 1 - autocvar__menu_alpha, DRAWFLAG_NORMAL);
+ draw_cursor_normal(mv_mousepos, '1 1 1', 1 - autocvar__menu_alpha);
}
-void Cmd_MapVote_MapDownload(float argc)
+void Cmd_MapVote_MapDownload(int argc)
{
+ TC(int, argc);
entity pak;
if(argc != 2 || !mv_pk3list)
{
- print(_("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!\n"));
return;
}
break;
if(!pak || pak.sv_entnum != id) {
- print(_("^1Error:^7 Couldn't find pak index.\n"));
+ LOG_INFO(_("^1Error:^7 Couldn't find pak index.\n"));
return;
}
mv_preview[id] = true;
return;
} else {
- print(_("Requesting preview...\n"));
+ LOG_INFO(_("Requesting preview...\n"));
localcmd(strcat("\ncmd mv_getpicture ", ftos(id), "\n"));
}
}
void MapVote_CheckPK3(string pic, string pk3, int id)
{
+ TC(int, id);
entity pak;
pak = spawn();
pak.netname = pk3;
void MapVote_CheckPic(string pic, string pk3, int id)
{
+ TC(int, id);
// never try to retrieve a pic for the "don't care" 'map'
if(mv_abstain && id == mv_num_maps - 1)
return;
void MapVote_ReadOption(int i)
{
+ TC(int, i);
string map = strzone(ReadString());
string pk3 = strzone(ReadString());
int j = bound(0, ReadByte(), n_ssdirs - 1);
void GameTypeVote_ReadOption(int i)
{
+ TC(int, i);
string gt = strzone(ReadString());
mv_maps[i] = gt;
void MapVote_Init()
{
- precache_sound ("misc/invshot.wav");
-
mv_active = 1;
if(autocvar_hud_cursormode) { setcursormode(1); }
else { mv_mousepos = '0.5 0 0' * vid_conwidth + '0 0.5 0' * vid_conheight; }
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)
{
n_ssdirs = 0;
}
-void MapVote_SendChoice(float index)
+void MapVote_SendChoice(int index)
{
+ TC(int, index);
localcmd(strcat("\nimpulse ", ftos(index+1), "\n"));
}
int MapVote_MoveLeft(int pos)
{
+ TC(int, pos);
int imp;
if ( pos < 0 )
imp = mv_num_maps - 1;
}
int MapVote_MoveRight(int pos)
{
+ TC(int, pos);
int imp;
if ( pos < 0 )
imp = 0;
}
int MapVote_MoveUp(int pos)
{
+ TC(int, pos);
int imp;
if ( pos < 0 )
imp = mv_num_maps - 1;
}
int MapVote_MoveDown(int pos)
{
+ TC(int, pos);
int imp;
if ( pos < 0 )
imp = 0;
return imp;
}
-float MapVote_InputEvent(float bInputType, float nPrimary, float nSecondary)
+float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary)
{
+ TC(int, bInputType);
float imp;
if (!mv_active)
mv_ownvote = ReadByte()-1;
}
-void Ent_MapVote()
+NET_HANDLE(ENT_CLIENT_MAPVOTE, bool isnew)
{
+ make_pure(this);
int sf = ReadByte();
+ return = true;
if(sf & 1)
MapVote_Init();
MapVote_UpdateVotes();
}
+NET_HANDLE(TE_CSQC_PICTURE, bool isNew)
+{
+ Net_MapVote_Picture();
+ return true;
+}
+
void Net_MapVote_Picture()
{
int type = ReadByte();
projects / xonotic / xonotic-data.pk3dir.git / blobdiff