X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fmapvoting.qc;h=3511c743f05b7478a6436c884775742962532b72;hp=665f1b8857d68f91b1b4ad13729d29567f64a474;hb=737346fcfbe5912ff5de24c2f22c0dbd894429a6;hpb=c6d440124df99b8b1f48fe7666332273535eb413 diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc index 665f1b885..3511c743f 100644 --- a/qcsrc/client/mapvoting.qc +++ b/qcsrc/client/mapvoting.qc @@ -9,6 +9,40 @@ #include "../dpdefs/keycodes.qh" + +int mv_num_maps; + +string mv_maps[MAPVOTE_COUNT]; +string mv_pics[MAPVOTE_COUNT]; +string mv_pk3[MAPVOTE_COUNT]; // map pk3 name or gametype human readable name +string mv_desc[MAPVOTE_COUNT]; +float mv_preview[MAPVOTE_COUNT]; +float mv_votes[MAPVOTE_COUNT]; +float mv_flags[MAPVOTE_COUNT]; +float mv_flags_start[MAPVOTE_COUNT]; +entity mv_pk3list; +float mv_abstain; +float mv_ownvote; +float mv_detail; +float mv_timeout; +float mv_top2_time; +float mv_top2_alpha; + +vector mv_mousepos; +int mv_selection; +int mv_columns; +int mv_mouse_selection; +int mv_selection_keyboard; + +float gametypevote; +string mapvote_chosenmap; +vector gtv_text_size; +vector gtv_text_size_small; + +const int NUM_SSDIRS = 4; +string ssdirs[NUM_SSDIRS]; +int n_ssdirs; + string MapVote_FormatMapItem(int id, string map, float _count, float maxwidth, vector fontsize) { string pre, post; @@ -17,7 +51,7 @@ string MapVote_FormatMapItem(int id, string map, float _count, float maxwidth, v { if(_count == 1) post = _(" (1 vote)"); - else if(_count >= 0 && mv_avail[id] == GTV_AVAILABLE) + else if(_count >= 0 && (mv_flags[id] & GTV_AVAILABLE)) post = sprintf(_(" (%d votes)"), _count); else post = ""; @@ -29,14 +63,9 @@ string MapVote_FormatMapItem(int id, string map, float _count, float maxwidth, v return strcat(pre, map, post); } -string GameTypeVote_DescriptionByID(int id) -{ - return MapInfo_Type_Description(MapInfo_Type_FromString(mv_maps[id])); -} - vector MapVote_RGB(int id) { - if(mv_avail[id] != GTV_AVAILABLE) + if(!(mv_flags[id] & GTV_AVAILABLE)) return '1 1 1'; if(id == mv_ownvote) return '0 1 0'; @@ -48,55 +77,66 @@ vector MapVote_RGB(int id) void GameTypeVote_DrawGameTypeItem(vector pos, float maxh, float tsize, string gtype, string pic, float _count, int id) { + // Find the correct alpha float alpha; - float desc_padding = gtv_text_size.x * 3; + if(!(mv_flags_start[id] & GTV_AVAILABLE)) + alpha = 0.2; // The gametype isn't supported by the map + else if ( !(mv_flags[id] & GTV_AVAILABLE) && mv_top2_alpha) + alpha = mv_top2_alpha; // Fade away if not one of the top 2 choice + else + alpha = 1; // Normal, full 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); + 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 = maxh + rect_margin; - vector rgb = MapVote_RGB(id); - vector offset = pos; - float nlines = 0; - if(mv_avail_start[id] != GTV_AVAILABLE) - alpha = 0.2; - else if ( mv_avail[id] != GTV_AVAILABLE && mv_top2_alpha) - alpha = mv_top2_alpha; - else - alpha = 1; - - if(id == mv_selection && mv_avail[id] == GTV_AVAILABLE) + // 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*alpha, DRAWFLAG_NORMAL); drawborderlines(autocvar_scoreboard_border_thickness, rect_pos, rect_size, rgb, alpha, DRAWFLAG_NORMAL); } - entity title; - title = spawn(); - title.message = MapVote_FormatMapItem(id, MapInfo_Type_ToText(MapInfo_Type_FromString(gtype)), - _count, tsize, gtv_text_size); - title.origin = pos-offset; - - pos.y += gtv_text_size_small.y; - pos.y += gtv_text_size.y/2; + vector offset = pos; - maxh -= gtv_text_size.y; + float title_gap = gtv_text_size.y * 1.4; // distance between the title and the description + pos.y += title_gap; + maxh -= title_gap; - entity picent = spawn(); - picent.origin = pos-offset; - picent.maxs = '1 1 0 ' * min(maxh, desc_padding) * 0.8; + // Evaluate the image size + vector image_size = '1 1 0' * gtv_text_size.x * 3; + if ( maxh < image_size.y ) + image_size = '1 1 0' * maxh; + image_size *= 0.8; + float desc_padding = gtv_text_size.x * 0.6; + pos.x += image_size.x + desc_padding; + tsize -= image_size.x + desc_padding; - pos.x += desc_padding; - tsize -= desc_padding; + // Split the description into lines + entity title; + title = spawn(); + title.message = MapVote_FormatMapItem(id, mv_pk3[id], _count, tsize, gtv_text_size); - string thelabel = GameTypeVote_DescriptionByID(id), ts; + string thelabel = mv_desc[id], ts; entity last = title; entity next = world; + float nlines = 0; if( thelabel != "") { float i,n = tokenizebyseparator(thelabel, "\n"); @@ -120,14 +160,19 @@ void GameTypeVote_DrawGameTypeItem(vector pos, float maxh, float tsize, string g } } - maxh -= max(nlines*gtv_text_size_small.y,picent.maxs.y); + // Center the contents in the bounding box + maxh -= max(nlines*gtv_text_size_small.y,image_size.y); if ( maxh > 0 ) offset.y += maxh/2; - drawstring(title.origin+offset, title.message, gtv_text_size, rgb, alpha, DRAWFLAG_NORMAL); + // Draw the title + drawstring(offset, title.message, gtv_text_size, rgb, alpha, DRAWFLAG_NORMAL); + + // Draw the icon if(pic != "") - drawpic(picent.origin+offset, pic, picent.maxs, '1 1 1', alpha, DRAWFLAG_NORMAL); + drawpic('0 1 0'*title_gap+'0.5 0 0'*desc_padding+offset, pic, image_size, '1 1 1', alpha, DRAWFLAG_NORMAL); + // Draw the description for ( last = title.chain; last ; ) { drawstring(last.origin+offset, last.message, gtv_text_size_small, '1 1 1', alpha, DRAWFLAG_NORMAL); @@ -136,44 +181,70 @@ void GameTypeVote_DrawGameTypeItem(vector pos, float maxh, float tsize, string g remove(next); } - remove(picent); + // Cleanup remove(title); } void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, string pic, float _count, 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; - rgb = MapVote_RGB(id); + 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); + + 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_avail[id] != GTV_AVAILABLE && mv_top2_alpha) + if (!(mv_flags[id] & GTV_AVAILABLE) && mv_top2_alpha) theAlpha = mv_top2_alpha; else theAlpha = 1; - 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, DRAWFLAG_NORMAL); - pos.x = pos.x + text_size*0.5 - img_size.x*0.5; - pos.y = pos.y - img_size.y; + // 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); - 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); @@ -185,14 +256,6 @@ 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_avail[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) @@ -203,8 +266,6 @@ void MapVote_DrawAbstain(vector pos, float isize, float tsize, float _count, int 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); @@ -254,18 +315,18 @@ 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; @@ -282,14 +343,15 @@ void MapVote_Draw() } 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"); @@ -297,63 +359,103 @@ void MapVote_Draw() pos.z = 0; 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; } + else + 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; + } - 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, eX * (xmax - xmin) + eY * (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); + } + tmp = vid_conheight / 3; // max height + if(dist.y > tmp) + { + dist.y = tmp; + dist.x = min(dist.x, dist.y * item_aspect); } + + // 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(1); + + if(panel_bg_padding) { - tsize = dist.x - 10; - isize = min(dist.y - 10, 0.75 * tsize); + // 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); - if ( !gametypevote ) - pos.x += dist.x / 2; - pos.y += (dist.y - isize) / 2; - ymax -= isize; - if (mv_top2_time) mv_top2_alpha = max(0.2, 1 - (time - mv_top2_time)*(time - mv_top2_time)); @@ -369,9 +471,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) @@ -379,9 +481,9 @@ 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); @@ -393,7 +495,7 @@ void Cmd_MapVote_MapDownload(float argc) 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; } @@ -403,7 +505,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; } @@ -412,7 +514,7 @@ 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")); } } @@ -466,20 +568,68 @@ void MapVote_ReadMask() mask = ReadLong(); for(i = 0, power = 1; i < mv_num_maps; ++i, power *= 2) - mv_avail[i] = (mask & power) ? GTV_AVAILABLE : GTV_FORBIDDEN; + { + if ( mask & power ) + mv_flags[i] |= GTV_AVAILABLE; + else + mv_flags[i] &= ~GTV_AVAILABLE; + } } else { for(i = 0; i < mv_num_maps; ++i ) - mv_avail[i] = ReadByte(); + mv_flags[i] = ReadByte(); } } -void MapVote_Init() +void MapVote_ReadOption(int i) { - int i, j; - string map, pk3, s; + string map = strzone(ReadString()); + string pk3 = strzone(ReadString()); + int j = bound(0, ReadByte(), n_ssdirs - 1); + + mv_maps[i] = map; + mv_pk3[i] = pk3; + mv_flags[i] = GTV_AVAILABLE; + + string pic = strzone(strcat(ssdirs[j], "/", map)); + mv_pics[i] = pic; + mv_preview[i] = false; + MapVote_CheckPic(pic, pk3, i); +} +void GameTypeVote_ReadOption(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); + + if ( mv_flags[i] & GTV_CUSTOM ) + { + string name = ReadString(); + if ( strlen(name) < 1 ) + name = gt; + mv_pk3[i] = strzone(name); + mv_desc[i] = strzone(ReadString()); + } + else + { + int type = MapInfo_Type_FromString(gt); + mv_pk3[i] = strzone(MapInfo_Type_ToText(type)); + mv_desc[i] = MapInfo_Type_Description(type); + } +} + +void MapVote_Init() +{ precache_sound ("misc/invshot.wav"); mv_active = 1; @@ -488,6 +638,7 @@ void MapVote_Init() mv_selection = -1; mv_selection_keyboard = 0; + string s; for(n_ssdirs = 0; ; ++n_ssdirs) { s = ReadString(); @@ -509,8 +660,6 @@ void MapVote_Init() gametypevote = ReadByte(); - float mv_real_num_maps = mv_num_maps - mv_abstain; - if(gametypevote) { mapvote_chosenmap = strzone(ReadString()); @@ -519,27 +668,12 @@ 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(); + int i; for(i = 0; i < mv_num_maps; ++i ) - mv_avail_start[i] = mv_avail[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! @@ -548,32 +682,10 @@ void MapVote_Init() { mv_votes[i] = 0; - map = strzone(ReadString()); - pk3 = strzone(ReadString()); - j = bound(0, ReadByte(), n_ssdirs - 1); - - mv_maps[i] = map; - mv_pk3[i] = pk3; - mv_avail[i] = ReadByte(); - - if(gametypevote) - { - //map = strzone(strcat("gfx/menu/default/gametype_", map)); - //map = strzone(sprintf("gfx/menu/%s/gametype_%s", autocvar_menu_skin, map)); - string mv_picpath = sprintf("gfx/menu/%s/gametype_%s", autocvar_menu_skin, map); - if(precache_pic(mv_picpath) == "") - mv_picpath = strcat("gfx/menu/default/gametype_", map); - map = strzone(mv_picpath); - mv_pics[i] = map; - mv_preview[i] = PreviewExists(map); - } + if ( gametypevote ) + GameTypeVote_ReadOption(i); else - { - map = strzone(strcat(ssdirs[j], "/", map)); - mv_pics[i] = map; - mv_preview[i] = false; - MapVote_CheckPic(map, pk3, i); - } + MapVote_ReadOption(i); } for(i = 0; i < n_ssdirs; ++i) @@ -593,7 +705,7 @@ int MapVote_MoveLeft(int pos) imp = mv_num_maps - 1; else imp = pos < 1 ? mv_num_maps - 1 : pos - 1; - if ( mv_avail[imp] != GTV_AVAILABLE && imp != mv_ownvote ) + if ( !(mv_flags[imp] & GTV_AVAILABLE) && imp != mv_ownvote ) imp = MapVote_MoveLeft(imp); return imp; } @@ -604,7 +716,7 @@ int MapVote_MoveRight(int pos) imp = 0; else imp = pos >= mv_num_maps - 1 ? 0 : pos + 1; - if ( mv_avail[imp] != GTV_AVAILABLE && imp != mv_ownvote ) + if ( !(mv_flags[imp] & GTV_AVAILABLE) && imp != mv_ownvote ) imp = MapVote_MoveRight(imp); return imp; } @@ -623,7 +735,7 @@ int MapVote_MoveUp(int pos) imp -= mv_columns; } } - if ( mv_avail[imp] != GTV_AVAILABLE && imp != mv_ownvote ) + if ( !(mv_flags[imp] & GTV_AVAILABLE) && imp != mv_ownvote ) imp = MapVote_MoveUp(imp); return imp; } @@ -638,7 +750,7 @@ int MapVote_MoveDown(int pos) if ( imp >= mv_num_maps ) imp = imp % mv_columns; } - if ( mv_avail[imp] != GTV_AVAILABLE && imp != mv_ownvote ) + if ( !(mv_flags[imp] & GTV_AVAILABLE) && imp != mv_ownvote ) imp = MapVote_MoveDown(imp); return imp; } @@ -731,7 +843,7 @@ void MapVote_UpdateVotes() int i; for(i = 0; i < mv_num_maps; ++i) { - if(mv_avail[i] == GTV_AVAILABLE) + if(mv_flags[i] & GTV_AVAILABLE) { if(mv_detail) mv_votes[i] = ReadByte();