X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmapvoting.qc;h=21bb421a960d3a0a4b8738b32ad9bc6d1ba0df26;hb=0bd99205bd154e058edc6b82995d24e3375f5f97;hp=f00ee544c059f76cd3ec85bdf5375914df4caa9e;hpb=1bc3ab0285f65c7ed0c75cbba00da2460921c973;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc index f00ee544c..29728dfde 100644 --- a/qcsrc/client/mapvoting.qc +++ b/qcsrc/client/mapvoting.qc @@ -1,18 +1,13 @@ #include "mapvoting.qh" -#include "_all.qh" -#include "hud.qh" -#include "scoreboard.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; -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 @@ -29,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; @@ -46,6 +40,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) @@ -66,6 +61,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) @@ -78,6 +74,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)) @@ -86,9 +83,16 @@ 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_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'; rect_size.x = tsize + rect_margin; @@ -97,15 +101,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; @@ -130,7 +134,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 != "") { @@ -173,47 +177,75 @@ 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'; - vector rgb; string label; float text_size; - isize -= hud_fontsize.y; // respect the text when calculating the image size + float rect_margin = hud_fontsize.y / 2; + + 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); - rgb = MapVote_RGB(id); + 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; - img_size.y = isize; - img_size.x = isize / 0.75; // 4:3 x can be stretched easily, height is defined in isize + 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; + img_size.x = img_size.y * img_ar; - pos.y = pos.y + img_size.y; + pos.y += (isize - img_size.y - hud_fontsize.y) / 2; label = MapVote_FormatMapItem(id, map, _count, tsize, hud_fontsize); 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; + + pos.x += (tsize - img_size.x) / 2; + float theAlpha; if (!(mv_flags[id] & GTV_AVAILABLE) && mv_top2_alpha) theAlpha = mv_top2_alpha; else theAlpha = 1; + theAlpha *= panel_fg_alpha; - pos.x -= text_size*0.5; - drawstring(pos, label, hud_fontsize, rgb, theAlpha, DRAWFLAG_NORMAL); + // Highlight selected item + if(id == mv_selection && (mv_flags[id] & GTV_AVAILABLE)) + 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_hud_panel_mapvote_highlight_border, rect_pos, rect_size, rgb, theAlpha, DRAWFLAG_NORMAL); + } - pos.x = pos.x + text_size*0.5 - img_size.x*0.5; - pos.y = pos.y - img_size.y; + drawstring(text_pos, label, hud_fontsize, rgb, theAlpha, DRAWFLAG_NORMAL); - pos += autocvar_scoreboard_border_thickness * '1 1 0'; - img_size -= (autocvar_scoreboard_border_thickness * 2) * '1 1 0'; if(pic == "") { drawfill(pos, img_size, '.5 .5 .5', .7 * theAlpha, DRAWFLAG_NORMAL); @@ -225,36 +257,28 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin 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; rgb = MapVote_RGB(id); - pos.y = pos.y + hud_fontsize.y; - label = MapVote_FormatMapItem(id, _("Don't care"), _count, tsize, hud_fontsize); 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) @@ -272,10 +296,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; @@ -294,105 +318,141 @@ 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; 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; + 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; - 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', panel_fg_alpha, 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', panel_fg_alpha, 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', panel_fg_alpha, DRAWFLAG_NORMAL); + pos.y += hud_fontsize.y * 1.5; + pos.y += hud_fontsize.y * 0.5; // 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; + } - rows = ceil(mv_num_maps / mv_columns); + // 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, vec2(xmax - xmin, ymax - ymin), item_aspect); + mv_columns = table_size.x; + rows = table_size.y; dist.x = (xmax - xmin) / mv_columns; dist.y = (ymax - pos.y) / rows; - if ( gametypevote ) + // reduce size of too wide items + tmp = vid_conwidth / 3; // max width + if(dist.x > tmp) { - tsize = dist.x - hud_fontsize.y; - isize = dist.y; - float maxheight = (ymax - pos.y) / 3; - if ( isize > maxheight ) - { - pos.x += (isize - maxheight)/2; - isize = maxheight; - } - else - dist.y += hud_fontsize.y; - pos.x = ( vid_conwidth - dist.x * mv_columns ) / 2; + dist.x = tmp; + dist.y = min(dist.y, dist.x / item_aspect); } - else + tmp = vid_conheight / 3; // max height + if(dist.y > tmp) { - tsize = dist.x - 10; - isize = min(dist.y - 10, 0.75 * tsize); + dist.y = tmp; + dist.x = min(dist.x, dist.y * item_aspect); } - mv_selection = MapVote_Selection(pos, dist, rows, mv_columns); + // reduce size to fix aspect ratio + if(dist.x / dist.y > item_aspect) + dist.x = dist.y * item_aspect; + else + dist.y = dist.x / item_aspect; + + // adjust table pos and size according to the new size + float offset; + offset = ((xmax - pos.x) - dist.x * mv_columns) / 2; + xmin = pos.x += offset; + xmax -= offset; + offset = ((ymax - pos.y) - dist.y * rows) / 2; + ymax -= 2 * offset; + + // 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(); + + 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; + } - if ( !gametypevote ) - pos.x += dist.x / 2; - pos.y += (dist.y - isize) / 2; - ymax -= isize; + mv_selection = MapVote_Selection(pos, dist, rows, mv_columns); if (mv_top2_time) mv_top2_alpha = max(0.2, 1 - (time - mv_top2_time)*(time - mv_top2_time)); @@ -409,9 +469,9 @@ void MapVote_Draw() 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) @@ -419,21 +479,22 @@ void MapVote_Draw() if(mv_abstain && i < mv_num_maps) { tmp = mv_votes[i]; - pos.y = ymax + isize - 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(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!\n")); return; } @@ -443,7 +504,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.\n")); return; } @@ -452,13 +513,14 @@ void Cmd_MapVote_MapDownload(float argc) 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; @@ -480,6 +542,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; @@ -522,6 +585,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); @@ -538,17 +602,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 ) { @@ -557,22 +617,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; @@ -598,8 +674,6 @@ void MapVote_Init() gametypevote = ReadByte(); - float mv_real_num_maps = mv_num_maps - mv_abstain; - if(gametypevote) { mapvote_chosenmap = strzone(ReadString()); @@ -608,22 +682,6 @@ void MapVote_Init() gtv_text_size = hud_fontsize*1.4; gtv_text_size_small = hud_fontsize*1.1; - - if (mv_real_num_maps > 8 ) - mv_columns = 3; - else - mv_columns = min(2, mv_real_num_maps); - } - else - { - if (mv_real_num_maps > 16) - mv_columns = 5; - else if (mv_real_num_maps > 9) - mv_columns = 4; - else if(mv_real_num_maps > 3) - mv_columns = 3; - else - mv_columns = mv_real_num_maps; } MapVote_ReadMask(); @@ -631,8 +689,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) { @@ -649,13 +707,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; @@ -667,6 +727,7 @@ int MapVote_MoveLeft(int pos) } int MapVote_MoveRight(int pos) { + TC(int, pos); int imp; if ( pos < 0 ) imp = 0; @@ -678,6 +739,7 @@ int MapVote_MoveRight(int pos) } int MapVote_MoveUp(int pos) { + TC(int, pos); int imp; if ( pos < 0 ) imp = mv_num_maps - 1; @@ -697,6 +759,7 @@ int MapVote_MoveUp(int pos) } int MapVote_MoveDown(int pos) { + TC(int, pos); int imp; if ( pos < 0 ) imp = 0; @@ -711,8 +774,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) @@ -720,8 +784,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; } @@ -813,9 +877,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(); @@ -827,6 +893,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();