X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fmapvoting.qc;h=0af74018eeb58406ed398d38033ce24773674cad;hp=5baa268fcfffba7616ab3957b9d62fee7e5ff974;hb=8f4d064a1d62a040e788fc0634baf93e888ba2f6;hpb=7a8e4ad81bf523a53882ef97822b0641e424730c diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc index 5baa268fc..0af74018e 100644 --- a/qcsrc/client/mapvoting.qc +++ b/qcsrc/client/mapvoting.qc @@ -21,13 +21,13 @@ float mv_selection; string MapVote_FormatMapItem(float id, string map, float count, float maxwidth, vector fontsize) { string pre, post; - pre = strcat(ftos(id+1), ". "); + pre = sprintf("%d. ", id+1); if(mv_detail) { if(count == 1) - post = strcat(" (1 vote)"); - else - post = strcat(" (", ftos(count), " votes)"); + post = _(" (1 vote)"); + else if(count >= 0) + post = sprintf(_(" (%d votes)"), count); } else post = ""; @@ -68,14 +68,14 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin text_size = stringwidth(label, false, hud_fontsize); - float alpha; + float theAlpha; if (count < 0 && mv_top2_alpha) - alpha = mv_top2_alpha; + theAlpha = mv_top2_alpha; else - alpha = 1; + theAlpha = 1; pos_x -= text_size*0.5; - drawstring(pos, label, hud_fontsize, rgb, alpha, DRAWFLAG_NORMAL); + drawstring(pos, label, hud_fontsize, rgb, theAlpha, DRAWFLAG_NORMAL); pos_x = pos_x + text_size*0.5 - img_size_x*0.5; pos_y = pos_y - img_size_y; @@ -84,17 +84,17 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin img_size -= (autocvar_scoreboard_border_thickness * 2) * '1 1 0'; if(pic == "") { - drawfill(pos, img_size, '.5 .5 .5', .7 * alpha, DRAWFLAG_NORMAL); + drawfill(pos, img_size, '.5 .5 .5', .7 * theAlpha, DRAWFLAG_NORMAL); } else { - drawpic(pos, pic, img_size, '1 1 1', alpha, DRAWFLAG_NORMAL); + drawpic(pos, pic, img_size, '1 1 1', theAlpha, DRAWFLAG_NORMAL); } if(id == mv_ownvote) - drawborderlines(autocvar_scoreboard_border_thickness, pos, img_size, rgb, alpha, DRAWFLAG_NORMAL); + drawborderlines(autocvar_scoreboard_border_thickness, pos, img_size, rgb, theAlpha, DRAWFLAG_NORMAL); else - drawborderlines(autocvar_scoreboard_border_thickness, pos, img_size, '0 0 0', alpha, DRAWFLAG_NORMAL); + drawborderlines(autocvar_scoreboard_border_thickness, pos, img_size, '0 0 0', theAlpha, DRAWFLAG_NORMAL); if(id == mv_selection && count >= 0) drawfill(pos, img_size, '1 1 1', 0.1, DRAWFLAG_NORMAL); @@ -110,7 +110,7 @@ void MapVote_DrawAbstain(vector pos, float isize, float tsize, float count, floa pos_y = pos_y + hud_fontsize_y; - label = MapVote_FormatMapItem(id, "Don't care", count, tsize, hud_fontsize); + label = MapVote_FormatMapItem(id, _("Don't care"), count, tsize, hud_fontsize); text_size = stringwidth(label, false, hud_fontsize); @@ -170,7 +170,7 @@ void MapVote_Draw() if(!mv_active) return; - + mv_mousepos = mv_mousepos + getmousepos(); mv_mousepos_x = bound(0, mv_mousepos_x, vid_conwidth); @@ -190,14 +190,14 @@ void MapVote_Draw() pos_y = ymin; pos_z = 0; - //pos_x = center - stringwidth("Vote for a map", false) * 0.5 * 24; - pos_x = center - stringwidth("Vote for a map", false, '12 0 0'); - drawstring(pos, "Vote for a map", '24 24 0', '1 1 1', 1, DRAWFLAG_NORMAL); + + map = _("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; i = ceil(max(0, mv_timeout - time)); - map = strcat(ftos(i), " seconds left"); - //pos_x = center - stringwidth(map, false) * 0.5 * 16; + 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; @@ -207,7 +207,7 @@ void MapVote_Draw() ymin = pos_y; if(mv_abstain) mv_num_maps -= 1; - + if(mv_num_maps > 3) { columns = 3; @@ -242,7 +242,7 @@ void MapVote_Draw() if(mv_abstain) ++mv_num_maps; - + if(mv_abstain && i < mv_num_maps) { tmp = mv_votes[i]; pos_y = ymax + isize - hud_fontsize_y; @@ -260,7 +260,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"); + print(_("mv_mapdownload: ^3You're not supposed to use this command on your own!\n")); return; } @@ -270,19 +270,16 @@ void Cmd_MapVote_MapDownload(float argc) break; if(!pak || pak.sv_entnum != id) { - print("^1Error:^7 Couldn't find pak index.\n"); + print(_("^1Error:^7 Couldn't find pak index.\n")); return; } - //print(strcat("^3Adding: ", ftos(id), " - ", pak.message, " - ")); - if(PreviewExists(pak.message)) { mv_preview[id] = true; - //print("^2Found...\n"); return; } else { - print("Requesting preview...\n"); + print(_("Requesting preview...\n")); localcmd(strcat("\ncmd mv_getpic ", ftos(id), "\n")); } } @@ -361,8 +358,8 @@ void MapVote_Init() else mv_maps_mask = ReadShort(); - // Assume mv_pk3list is NULL, there should only be 1 mapvote per round - mv_pk3list = NULL; // I'm still paranoid! + // 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) { @@ -381,7 +378,6 @@ void MapVote_Init() mv_preview[i] = false; - //print(strcat("RECV: ", map, " in ", pk3, "\n")); MapVote_CheckPic(map, pk3, i); } else @@ -415,6 +411,19 @@ float MapVote_InputEvent(float bInputType, float nPrimary, float nSecondary) localcmd(strcat("\nimpulse ", ftos(imp), "\n")); return true; } + switch(nPrimary) + { + case K_KP_1: localcmd("\nimpulse 1\n"); return true; + case K_KP_2: localcmd("\nimpulse 2\n"); return true; + case K_KP_3: localcmd("\nimpulse 3\n"); return true; + case K_KP_4: localcmd("\nimpulse 4\n"); return true; + case K_KP_5: localcmd("\nimpulse 5\n"); return true; + case K_KP_6: localcmd("\nimpulse 6\n"); return true; + case K_KP_7: localcmd("\nimpulse 7\n"); return true; + 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; + } if (nPrimary == K_MOUSE1) if (mv_selection >= 0) @@ -440,7 +449,7 @@ void MapVote_UpdateMask() if(oldmask & mv_maps_mask != oldmask) if(oldmask & mv_maps_mask == mv_maps_mask) - sound(world, CHAN_AUTO, "misc_invshot.wav", VOL_BASE, ATTN_NONE); + sound(world, CH_INFO, "misc_invshot.wav", VOL_BASE, ATTN_NONE); // remove votes that no longer apply for(i = 0, power = 1; i < mv_num_maps; ++i, power *= 2)