X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmapvoting.qc;h=29640128c0abf575c8a8b43fa03cb81c5d044e9e;hb=037dd7200c04a1a6c5b1d913346dd6bbbc74ad89;hp=03e94dc7f304238bc916443bc4a6fbef512d7bc7;hpb=74cbc0f6613383108745f231c78a340d747fc094;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc index 03e94dc7f..29640128c 100644 --- a/qcsrc/client/mapvoting.qc +++ b/qcsrc/client/mapvoting.qc @@ -1,13 +1,18 @@ #include "mapvoting.qh" -#include "autocvars.qh" -#include "miscfunctions.qh" -#include "defs.qh" -#include "hud/_mod.qh" -#include "hud/panel/scoreboard.qh" - +#include +#include +#include #include +#include + +// MapVote (#21) +void MapVote_Draw_Export(int fh) +{ + // allow saving cvars that aesthetically change the panel into hud skin files + HUD_Write_Cvar("hud_panel_mapvote_highlight_border"); +} int mv_num_maps; @@ -41,6 +46,19 @@ const int NUM_SSDIRS = 4; string ssdirs[NUM_SSDIRS]; int n_ssdirs; +bool PreviewExists(string name) +{ + if(autocvar_cl_readpicture_force) + return false; + + if (fexists(strcat(name, ".tga"))) return true; + if (fexists(strcat(name, ".png"))) return true; + if (fexists(strcat(name, ".jpg"))) return true; + if (fexists(strcat(name, ".pcx"))) return true; + + return false; +} + string MapVote_FormatMapItem(int id, string map, float _count, float maxwidth, vector fontsize) { TC(int, id); @@ -321,6 +339,7 @@ float MapVote_Selection(vector topleft, vector cellsize, float rows, float colum return mv_mouse_selection; } +// draws map vote or gametype vote void MapVote_Draw() { string map; @@ -337,14 +356,6 @@ void MapVote_Draw() HUD_Panel_LoadCvars(); - if (!autocvar_hud_cursormode) - { - vector mpos = mousepos; - update_mousepos(); - if (mpos.x != mousepos.x || mpos.y != mousepos.y) - mv_selection_keyboard = 0; - } - center = (vid_conwidth - 1)/2; xmin = vid_conwidth * 0.08; xmax = vid_conwidth - xmin; @@ -357,6 +368,11 @@ void MapVote_Draw() ymax -= chat_sizey; hud_fontsize = HUD_GetFontsize("hud_fontsize"); + if (gametypevote) + { + gtv_text_size = hud_fontsize * 1.4; + gtv_text_size_small = hud_fontsize * 1.1; + } pos.y = ymin; pos.z = 0; @@ -457,7 +473,7 @@ void MapVote_Draw() 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)); + mv_top2_alpha = max(0.2, 1 - (time - mv_top2_time) ** 2); void (vector, float, float, string, string, float, float) DrawItem; @@ -485,8 +501,6 @@ void MapVote_Draw() pos.x = (xmax+xmin)*0.5; MapVote_DrawAbstain(pos, dist.x, xmax - xmin, tmp, i); } - - draw_cursor_normal(mousepos, '1 1 1', panel_fg_alpha); } void Cmd_MapVote_MapDownload(int argc) @@ -623,7 +637,7 @@ void GameTypeVote_ReadOption(int i) } else { - Gametype type = MapInfo_Type_FromString(gt); + Gametype type = MapInfo_Type_FromString(gt, false); mv_pk3[i] = strzone(MapInfo_Type_ToText(type)); mv_desc[i] = MapInfo_Type_Description(type); } @@ -649,8 +663,7 @@ void GameTypeVote_ReadOption(int i) void MapVote_Init() { mv_active = 1; - if(autocvar_hud_cursormode) setcursormode(1); - else mousepos = '0.5 0 0' * vid_conwidth + '0 0.5 0' * vid_conheight; + if(!autocvar_hud_cursormode) mousepos = '0.5 0 0' * vid_conwidth + '0 0.5 0' * vid_conheight; mv_selection = -1; mv_selection_keyboard = 0; @@ -681,9 +694,6 @@ void MapVote_Init() mapvote_chosenmap = strzone(ReadString()); if ( gametypevote == 2 ) gametypevote = 0; - - gtv_text_size = hud_fontsize*1.4; - gtv_text_size_small = hud_fontsize*1.1; } MapVote_ReadMask(); @@ -750,9 +760,11 @@ int MapVote_MoveUp(int pos) 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; + int mv_rows = ceil(mv_num_maps / mv_columns); + if (imp == -mv_columns) // pos == 0 + imp = mv_columns * mv_rows - 1; + else + imp = imp + mv_columns * mv_rows - 1; } } if ( !(mv_flags[imp] & GTV_AVAILABLE) && imp != mv_ownvote ) @@ -769,7 +781,12 @@ int MapVote_MoveDown(int pos) { imp = pos + mv_columns; if ( imp >= mv_num_maps ) - imp = imp % mv_columns; + { + if ((imp % mv_columns) == mv_columns - 1) + imp = 0; + else + imp = imp % mv_columns + 1; + } } if ( !(mv_flags[imp] & GTV_AVAILABLE) && imp != mv_ownvote ) imp = MapVote_MoveDown(imp); @@ -779,8 +796,8 @@ int MapVote_MoveDown(int pos) float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary) { TC(int, bInputType); - float imp; + static int first_digit = 0; if (!mv_active) return false; @@ -792,29 +809,40 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary) return true; } - if (bInputType != 0) + if (bInputType == 2) + { + mv_selection_keyboard = 0; return false; + } - if ('0' <= nPrimary && nPrimary <= '9') + // at this point bInputType can only be 0 or 1 (key pressed or released) + bool key_pressed = (bInputType == 0); + + if (key_pressed) { - imp = nPrimary - '0'; - if (imp == 0) imp = 10; - localcmd(strcat("\nimpulse ", ftos(imp), "\n")); - return true; + if (nPrimary == K_ALT) hudShiftState |= S_ALT; + if (nPrimary == K_CTRL) hudShiftState |= S_CTRL; + if (nPrimary == K_SHIFT) hudShiftState |= S_SHIFT; } - switch(nPrimary) + else { - 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_ALT) hudShiftState -= (hudShiftState & S_ALT); + if (nPrimary == K_CTRL) hudShiftState -= (hudShiftState & S_CTRL); + if (nPrimary == K_SHIFT) hudShiftState -= (hudShiftState & S_SHIFT); + + if (nPrimary == K_CTRL) + first_digit = 0; + } + // Key release events must be handled by the engine otherwise the on-press command such as +jump + // executed by pressing SPACE before entering the map voting screen won't be followed by the + // on-release command (-jump) on key release once entered the map voting screen, causing +jump + // to stay active even on the next map and automatically forcing the player to join + if (!key_pressed) return false; + + int imp = 0; + switch(nPrimary) + { case K_RIGHTARROW: mv_selection_keyboard = 1; mv_selection = MapVote_MoveRight(mv_selection); @@ -837,6 +865,27 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary) if ( mv_selection_keyboard ) MapVote_SendChoice(mv_selection); return true; + case '1': case K_KP_1: imp = 1; break; + case '2': case K_KP_2: imp = 2; break; + case '3': case K_KP_3: imp = 3; break; + case '4': case K_KP_4: imp = 4; break; + case '5': case K_KP_5: imp = 5; break; + case '6': case K_KP_6: imp = 6; break; + case '7': case K_KP_7: imp = 7; break; + case '8': case K_KP_8: imp = 8; break; + case '9': case K_KP_9: imp = 9; break; + case '0': case K_KP_0: imp = 10; break; + } + + if (imp && hudShiftState & S_CTRL) + { + if (!first_digit) + { + first_digit = imp % 10; + return true; + } + else + imp = first_digit * 10 + (imp % 10); } if (nPrimary == K_MOUSE1) @@ -844,11 +893,17 @@ float MapVote_InputEvent(int bInputType, float nPrimary, float nSecondary) mv_selection_keyboard = 0; mv_selection = mv_mouse_selection; if (mv_selection >= 0) - { imp = min(mv_selection + 1, mv_num_maps); + } + + if (nPrimary == K_MOUSE2) + return true; // do nothing + + if (imp) + { + if (imp <= mv_num_maps) localcmd(strcat("\nimpulse ", ftos(imp), "\n")); - return true; - } + return true; } return false;