X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmapvoting.qc;h=3223bf120aa7cc012f9143e21bc671f12ee9031b;hb=13832240e226eba119844d7bd02ca51b617e586a;hp=037d906fbe09c1ec9f3a2b0f91a77be42c609e4a;hpb=919c48e2ad5873bf1efb041be2e23e2e60903baf;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc index 037d906fbe..8412bd7579 100644 --- a/qcsrc/client/mapvoting.qc +++ b/qcsrc/client/mapvoting.qc @@ -1,13 +1,12 @@ #include "mapvoting.qh" -#include "_all.qh" -#include "hud.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" -#include "../common/util.qh" - -#include "../dpdefs/keycodes.qh" +#include int mv_num_maps; @@ -28,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; @@ -45,6 +43,7 @@ int n_ssdirs; 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) @@ -65,6 +64,7 @@ string MapVote_FormatMapItem(int id, string map, float _count, float maxwidth, v vector MapVote_RGB(int id) { + TC(int, id); if(!(mv_flags[id] & GTV_AVAILABLE)) return '1 1 1'; if(id == mv_ownvote) @@ -77,6 +77,7 @@ vector MapVote_RGB(int id) 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)) @@ -85,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'; @@ -102,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; @@ -135,7 +137,7 @@ void GameTypeVote_DrawGameTypeItem(vector pos, float maxh, float tsize, string g string thelabel = mv_desc[id], ts; entity last = title; - entity next = world; + entity next = NULL; float nlines = 0; if( thelabel != "") { @@ -178,25 +180,26 @@ 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) { + TC(int, id); vector img_size = '0 0 0'; string label; float text_size; 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); @@ -260,6 +264,7 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin void MapVote_DrawAbstain(vector pos, float isize, float tsize, float _count, int id) { + TC(int, id); vector rgb; float text_size; string label; @@ -271,11 +276,12 @@ 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) { + TC(int, i); TC(int, m); int r = i % m; return '1 0 0' * (gridspec.x * r) @@ -293,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; @@ -315,7 +321,6 @@ float MapVote_Selection(vector topleft, vector cellsize, float rows, float colum return mv_mouse_selection; } -vector HUD_GetTableSize_BestItemAR(int item_count, vector psize, float item_aspect); void MapVote_Draw() { string map; @@ -330,16 +335,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; @@ -358,35 +361,32 @@ void MapVote_Draw() 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, 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; } - else - pos.y += hud_fontsize.y * 0.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, 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 +400,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 +440,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,16 +486,17 @@ void MapVote_Draw() 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(mousepos, '1 1 1', panel_fg_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!")); return; } @@ -505,7 +506,7 @@ void Cmd_MapVote_MapDownload(float argc) 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.")); return; } @@ -514,13 +515,14 @@ void Cmd_MapVote_MapDownload(float argc) mv_preview[id] = true; return; } else { - print(_("Requesting preview...\n")); + LOG_INFO(_("Requesting preview...")); 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; @@ -542,6 +544,7 @@ void MapVote_CheckPK3(string pic, string pk3, int id) 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; @@ -559,7 +562,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) @@ -567,9 +570,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; @@ -584,6 +587,7 @@ void MapVote_ReadMask() void MapVote_ReadOption(int i) { + TC(int, i); string map = strzone(ReadString()); string pk3 = strzone(ReadString()); int j = bound(0, ReadByte(), n_ssdirs - 1); @@ -600,17 +604,13 @@ void MapVote_ReadOption(int i) void GameTypeVote_ReadOption(int i) { + TC(int, i); string gt = strzone(ReadString()); 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 ) { @@ -619,22 +619,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() { - 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; } + 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; @@ -675,8 +691,8 @@ void MapVote_Init() 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) { @@ -693,13 +709,15 @@ void MapVote_Init() 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; @@ -711,6 +729,7 @@ int MapVote_MoveLeft(int pos) } int MapVote_MoveRight(int pos) { + TC(int, pos); int imp; if ( pos < 0 ) imp = 0; @@ -722,6 +741,7 @@ int MapVote_MoveRight(int pos) } int MapVote_MoveUp(int pos) { + TC(int, pos); int imp; if ( pos < 0 ) imp = mv_num_maps - 1; @@ -741,6 +761,7 @@ int MapVote_MoveUp(int pos) } int MapVote_MoveDown(int pos) { + TC(int, pos); int imp; if ( pos < 0 ) imp = 0; @@ -755,8 +776,9 @@ int MapVote_MoveDown(int pos) 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) @@ -764,8 +786,8 @@ float MapVote_InputEvent(float 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; } @@ -857,9 +879,11 @@ void MapVote_UpdateVotes() 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(); @@ -871,6 +895,12 @@ void Ent_MapVote() MapVote_UpdateVotes(); } +NET_HANDLE(TE_CSQC_PICTURE, bool isNew) +{ + Net_MapVote_Picture(); + return true; +} + void Net_MapVote_Picture() { int type = ReadByte();