X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fmapvoting.qc;h=ddd20c7cf06da738c4e7d6c292f15e31fd3b55d0;hp=8caeb01d524064f51c3191440555c0cd814ce0e3;hb=d6fa4cbca32e3eb9a1c21a27e97b0c6cbc970fd5;hpb=e0ac5f9f14e169a1e19d0e36b85cab061a74ed93 diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc index 8caeb01d5..ddd20c7cf 100644 --- a/qcsrc/client/mapvoting.qc +++ b/qcsrc/client/mapvoting.qc @@ -6,17 +6,26 @@ string mv_pics[MAPVOTE_COUNT]; string mv_pk3[MAPVOTE_COUNT]; float mv_preview[MAPVOTE_COUNT]; float mv_votes[MAPVOTE_COUNT]; +float mv_avail[MAPVOTE_COUNT]; +float mv_avail_start[MAPVOTE_COUNT]; entity mv_pk3list; float mv_abstain; float mv_ownvote; float mv_detail; float mv_timeout; -float mv_maps_mask; float mv_top2_time; float mv_top2_alpha; vector mv_mousepos; float mv_selection; +float mv_columns; +float mv_mouse_selection; +float mv_selection_keyboard; + +float gametypevote; +string mapvote_choosenmap; +vector gtv_text_size; +vector gtv_text_size_small; string MapVote_FormatMapItem(float id, string map, float count, float maxwidth, vector fontsize) { @@ -26,7 +35,7 @@ string MapVote_FormatMapItem(float id, string map, float count, float maxwidth, { if(count == 1) post = _(" (1 vote)"); - else if(count >= 0) + else if(count >= 0 && mv_avail[id] == GTV_AVAILABLE) post = sprintf(_(" (%d votes)"), count); else post = ""; @@ -38,9 +47,14 @@ string MapVote_FormatMapItem(float id, string map, float count, float maxwidth, return strcat(pre, map, post); } -vector MapVote_RGB(float id, float count) +string GameTypeVote_DescriptionByID(float id) +{ + return MapInfo_Type_Description(MapInfo_Type_FromString(mv_maps[id])); +} + +vector MapVote_RGB(float id) { - if(count < 0) + if(mv_avail[id] != GTV_AVAILABLE) return '1 1 1'; if(id == mv_ownvote) return '0 1 0'; @@ -50,6 +64,100 @@ vector MapVote_RGB(float id, float count) return '1 1 1'; } +void GameTypeVote_DrawGameTypeItem(vector pos, float maxh, float tsize, string gtype, string pic, float count, float id) +{ + float alpha; + float desc_padding = gtv_text_size_x * 3; + float rect_margin = hud_fontsize_y / 2; + 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) + { + drawfill(rect_pos, rect_size, '1 1 1', 0.1, DRAWFLAG_NORMAL); + } + 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; + + maxh -= gtv_text_size_y; + + entity picent = spawn(); + picent.origin = pos-offset; + picent.maxs = '1 1 0 ' * min(maxh, desc_padding) * 0.8; + + pos_x += desc_padding; + tsize -= desc_padding; + + string thelabel = GameTypeVote_DescriptionByID(id), ts; + entity last = title; + entity next = world; + if( thelabel != "") + { + float i,n = tokenizebyseparator(thelabel, "\n"); + for(i = 0; i < n && maxh > (nlines+1)*gtv_text_size_small_y; ++i) + { + getWrappedLine_remaining = argv(i); + while(getWrappedLine_remaining && maxh > (nlines+1)*gtv_text_size_small_y) + { + ts = getWrappedLine(tsize, gtv_text_size_small, stringwidth_colors); + if (ts != "") + { + next = spawn(); + next.message = ts; + next.origin = pos-offset; + last.chain = next; + last = next; + pos_y += gtv_text_size_small_y; + nlines++; + } + } + } + } + + maxh -= max(nlines*gtv_text_size_small_y,picent.maxs_y); + if ( maxh > 0 ) + offset_y += maxh/2; + drawstring(title.origin+offset, title.message, gtv_text_size, rgb, alpha, DRAWFLAG_NORMAL); + + if(pic != "") + drawpic(picent.origin+offset, pic, picent.maxs, '1 1 1', alpha, DRAWFLAG_NORMAL); + + for ( last = title.chain; last ; ) + { + drawstring(last.origin+offset, last.message, gtv_text_size_small, '1 1 1', alpha, DRAWFLAG_NORMAL); + next = last; + last = last.chain; + remove(next); + } + + remove(picent); + remove(title); +} + void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, string pic, float count, float id) { vector img_size = '0 0 0'; @@ -59,7 +167,7 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin isize -= hud_fontsize_y; // respect the text when calculating the image size - rgb = MapVote_RGB(id, count); + rgb = MapVote_RGB(id); img_size_y = isize; img_size_x = isize / 0.75; // 4:3 x can be stretched easily, height is defined in isize @@ -71,7 +179,7 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin text_size = stringwidth(label, false, hud_fontsize); float theAlpha; - if (count < 0 && mv_top2_alpha) + if (mv_avail[id] != GTV_AVAILABLE && mv_top2_alpha) theAlpha = mv_top2_alpha; else theAlpha = 1; @@ -101,7 +209,7 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin else drawborderlines(autocvar_scoreboard_border_thickness, pos, img_size, '0 0 0', theAlpha, DRAWFLAG_NORMAL); - if(id == mv_selection && count >= 0) + if(id == mv_selection && mv_avail[id] == GTV_AVAILABLE) drawfill(pos, img_size, '1 1 1', 0.1, DRAWFLAG_NORMAL); } @@ -111,7 +219,7 @@ void MapVote_DrawAbstain(vector pos, float isize, float tsize, float count, floa float text_size; string label; - rgb = MapVote_RGB(id, count); + rgb = MapVote_RGB(id); pos_y = pos_y + hud_fontsize_y; @@ -135,10 +243,10 @@ vector MapVote_GridVec(vector gridspec, float i, float m) float MapVote_Selection(vector topleft, vector cellsize, float rows, float columns) { - float cell; + float c, r; - cell = -1; + mv_mouse_selection = -1; for (r = 0; r < rows; ++r) for (c = 0; c < columns; ++c) @@ -148,18 +256,21 @@ float MapVote_Selection(vector topleft, vector cellsize, float rows, float colum mv_mousepos_y >= topleft_y + cellsize_y * r && mv_mousepos_y <= topleft_y + cellsize_y * (r + 1)) { - cell = r * columns + c; + mv_mouse_selection = r * columns + c; break; } } - if (cell >= mv_num_maps) - cell = -1; + if (mv_mouse_selection >= mv_num_maps) + mv_mouse_selection = -1; - if (mv_abstain && cell < 0) - return mv_num_maps; + if (mv_abstain && mv_mouse_selection < 0) + mv_mouse_selection = mv_num_maps; - return cell; + if ( mv_selection_keyboard ) + return mv_selection; + + return mv_mouse_selection; } void MapVote_Draw() @@ -169,7 +280,7 @@ void MapVote_Draw() vector pos; float isize; float center; - float columns, rows; + float rows; float tsize; vector dist = '0 0 0'; @@ -178,10 +289,14 @@ void MapVote_Draw() if (!autocvar_hud_cursormode) { - mv_mousepos = mv_mousepos + getmousepos(); + 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 ) + mv_selection_keyboard = 0; + mv_mousepos = mpos; - mv_mousepos_x = bound(0, mv_mousepos_x, vid_conwidth); - mv_mousepos_y = bound(0, mv_mousepos_y, vid_conheight); } center = (vid_conwidth - 1)/2; @@ -200,11 +315,18 @@ void MapVote_Draw() pos_z = 0; draw_beginBoldFont(); - map = _("Vote for a map"); + 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; + if(gametypevote && mapvote_choosenmap != "" ) + { + pos_x = center - stringwidth(mapvote_choosenmap, false, hud_fontsize); + drawstring(pos, mapvote_choosenmap, hud_fontsize*2, '1 1 1', 1, DRAWFLAG_NORMAL); + pos_y += hud_fontsize_y*2; + } + i = ceil(max(0, mv_timeout - time)); map = sprintf(_("%d seconds left"), i); pos_x = center - stringwidth(map, false, '8 0 0'); @@ -218,36 +340,56 @@ void MapVote_Draw() if(mv_abstain) mv_num_maps -= 1; - if(mv_num_maps > 3) - { - columns = 3; - } else { - columns = mv_num_maps; - } - rows = ceil(mv_num_maps / columns); + rows = ceil(mv_num_maps / mv_columns); - dist_x = (xmax - xmin) / columns; + dist_x = (xmax - xmin) / mv_columns; dist_y = (ymax - pos_y) / rows; - tsize = dist_x - 10; - isize = min(dist_y - 10, 0.75 * tsize); - mv_selection = MapVote_Selection(pos, dist, rows, columns); + if ( gametypevote ) + { + 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; + } + else + { + tsize = dist_x - 10; + isize = min(dist_y - 10, 0.75 * tsize); + } + + mv_selection = MapVote_Selection(pos, dist, rows, mv_columns); - pos_x += (xmax - xmin) / (2 * 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)); + void (vector, float, float, string, string, float, float) DrawItem; + + if(gametypevote) + DrawItem = GameTypeVote_DrawGameTypeItem; + else + DrawItem = MapVote_DrawMapItem; + for(i = 0; i < mv_num_maps; ++i) { 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]) - MapVote_DrawMapItem(pos + MapVote_GridVec(dist, i, columns), isize, tsize, map, mv_pics[i], tmp, i); + DrawItem(pos + MapVote_GridVec(dist, i, mv_columns), isize, tsize, map, mv_pics[i], tmp, i); else - MapVote_DrawMapItem(pos + MapVote_GridVec(dist, i, columns), isize, tsize, map, "", tmp, i); + DrawItem(pos + MapVote_GridVec(dist, i, mv_columns), isize, tsize, map, "", tmp, i); } if(mv_abstain) @@ -329,12 +471,35 @@ void MapVote_CheckPic(string pic, string pk3, float id) MapVote_CheckPK3(pic, pk3, id); } +void MapVote_ReadMask() +{ + float i; + if ( mv_num_maps < 24 ) + { + float mask, power; + if(mv_num_maps < 8) + mask = ReadByte(); + else if(mv_num_maps < 16) + mask = ReadShort(); + else + mask = ReadLong(); + + for(i = 0, power = 1; i < mv_num_maps; ++i, power *= 2) + mv_avail[i] = (mask & power) ? GTV_AVAILABLE : GTV_FORBIDDEN; + } + else + { + for(i = 0; i < mv_num_maps; ++i ) + mv_avail[i] = ReadByte(); + } +} + #define NUM_SSDIRS 4 string ssdirs[NUM_SSDIRS]; float n_ssdirs; void MapVote_Init() { - float i, j, power; + float i, j; string map, pk3, s; precache_sound ("misc/invshot.wav"); @@ -343,6 +508,7 @@ void MapVote_Init() if(autocvar_hud_cursormode) { setcursormode(1); } else { mv_mousepos = '0.5 0 0' * vid_conwidth + '0 0.5 0' * vid_conheight; } mv_selection = -1; + mv_selection_keyboard = 0; for(n_ssdirs = 0; ; ++n_ssdirs) { @@ -363,39 +529,71 @@ void MapVote_Init() mv_ownvote = -1; mv_timeout = ReadCoord(); - if(mv_num_maps <= 8) - mv_maps_mask = ReadByte(); - else - mv_maps_mask = ReadShort(); + gametypevote = ReadByte(); + + float mv_real_num_maps = mv_num_maps - mv_abstain; + + if(gametypevote) + { + // read map name in case we have nextmap set + mapvote_choosenmap = strzone(ReadString()); + + 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(); + for(i = 0; i < mv_num_maps; ++i ) + mv_avail_start[i] = mv_avail[i]; // Assume mv_pk3list is world, there should only be 1 mapvote per round mv_pk3list = world; // I'm still paranoid! - for(i = 0, power = 1; i < mv_num_maps; ++i, power *= 2) + for(i = 0; i < mv_num_maps; ++i) { mv_votes[i] = 0; - if(mv_maps_mask & power) - { - map = strzone(ReadString()); - pk3 = strzone(ReadString()); - j = bound(0, ReadByte(), n_ssdirs - 1); - - mv_maps[i] = map; - mv_pk3[i] = pk3; - map = strzone(strcat(ssdirs[j], "/", map)); - mv_pics[i] = map; + map = strzone(ReadString()); + pk3 = strzone(ReadString()); + j = bound(0, ReadByte(), n_ssdirs - 1); - mv_preview[i] = false; + mv_maps[i] = map; + mv_pk3[i] = pk3; + mv_avail[i] = ReadByte(); - MapVote_CheckPic(map, pk3, i); + 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); } else { - mv_maps[i] = strzone("if-you-see-this-the-code-is-broken"); - mv_pk3[i] = strzone("if-you-see-this-the-code-is-broken"); - mv_pics[i] = strzone("if-you-see-this-the-code-is-broken"); + map = strzone(strcat(ssdirs[j], "/", map)); + mv_pics[i] = map; mv_preview[i] = false; + MapVote_CheckPic(map, pk3, i); } } @@ -404,6 +602,68 @@ void MapVote_Init() n_ssdirs = 0; } +void MapVote_SendChoice(float index) +{ + localcmd(strcat("\nimpulse ", ftos(index+1), "\n")); +} + +float MapVote_MoveLeft(float pos) +{ + float imp; + if ( pos < 0 ) + imp = mv_num_maps - 1; + else + imp = pos < 1 ? mv_num_maps - 1 : pos - 1; + if ( mv_avail[imp] != GTV_AVAILABLE && imp != mv_ownvote ) + imp = MapVote_MoveLeft(imp); + return imp; +} +float MapVote_MoveRight(float pos) +{ + float imp; + if ( pos < 0 ) + imp = 0; + else + imp = pos >= mv_num_maps - 1 ? 0 : pos + 1; + if ( mv_avail[imp] != GTV_AVAILABLE && imp != mv_ownvote ) + imp = MapVote_MoveRight(imp); + return imp; +} +float MapVote_MoveUp(float pos) +{ + float imp; + if ( pos < 0 ) + imp = mv_num_maps - 1; + else + { + imp = pos - mv_columns; + if ( imp < 0 ) + { + imp = floor(mv_num_maps/mv_columns)*mv_columns + pos % mv_columns; + if ( imp >= mv_num_maps ) + imp -= mv_columns; + } + } + if ( mv_avail[imp] != GTV_AVAILABLE && imp != mv_ownvote ) + imp = MapVote_MoveUp(imp); + return imp; +} +float MapVote_MoveDown(float pos) +{ + float imp; + if ( pos < 0 ) + imp = 0; + else + { + imp = pos + mv_columns; + if ( imp >= mv_num_maps ) + imp = imp % mv_columns; + } + if ( mv_avail[imp] != GTV_AVAILABLE && imp != mv_ownvote ) + imp = MapVote_MoveDown(imp); + return imp; +} + float MapVote_InputEvent(float bInputType, float nPrimary, float nSecondary) { float imp; @@ -415,6 +675,7 @@ float MapVote_InputEvent(float bInputType, float nPrimary, float nSecondary) { mv_mousepos_x = nPrimary; mv_mousepos_y = nSecondary; + mv_selection_keyboard = 0; return true; } @@ -440,48 +701,58 @@ float MapVote_InputEvent(float bInputType, float nPrimary, float nSecondary) case K_KP_8: localcmd("\nimpulse 8\n"); return true; case K_KP_9: localcmd("\nimpulse 9\n"); return true; case K_KP_0: localcmd("\nimpulse 10\n"); return true; + + case K_RIGHTARROW: + mv_selection_keyboard = 1; + mv_selection = MapVote_MoveRight(mv_selection); + return true; + case K_LEFTARROW: + mv_selection_keyboard = 1; + mv_selection = MapVote_MoveLeft(mv_selection); + return true; + case K_DOWNARROW: + mv_selection_keyboard = 1; + mv_selection = MapVote_MoveDown(mv_selection); + return true; + case K_UPARROW: + mv_selection_keyboard = 1; + mv_selection = MapVote_MoveUp(mv_selection); + return true; + case K_KP_ENTER: + case K_ENTER: + case K_SPACE: + if ( mv_selection_keyboard ) + MapVote_SendChoice(mv_selection); + return true; } if (nPrimary == K_MOUSE1) + { + mv_selection_keyboard = 0; + mv_selection = mv_mouse_selection; if (mv_selection >= 0) { imp = min(mv_selection + 1, mv_num_maps); localcmd(strcat("\nimpulse ", ftos(imp), "\n")); return true; } + } return false; } void MapVote_UpdateMask() { - float i, power; - float oldmask; - - oldmask = mv_maps_mask; - if(mv_num_maps <= 8) - mv_maps_mask = ReadByte(); - else - mv_maps_mask = ReadShort(); - - if((oldmask & mv_maps_mask) != oldmask) - if((oldmask & mv_maps_mask) == mv_maps_mask) - sound(world, CH_INFO, "misc_invshot.wav", VOL_BASE, ATTEN_NONE); - - // remove votes that no longer apply - for(i = 0, power = 1; i < mv_num_maps; ++i, power *= 2) - if (!(mv_maps_mask & power)) - mv_votes[i] = -1; - + MapVote_ReadMask(); mv_top2_time = time; } void MapVote_UpdateVotes() { - float i, power; - for(i = 0, power = 1; i < mv_num_maps; ++i, power *= 2) + float i; + for(i = 0; i < mv_num_maps; ++i) { - if(mv_maps_mask & power) + if(mv_avail[i] == GTV_AVAILABLE) { if(mv_detail) mv_votes[i] = ReadByte();