X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fquickmenu.qc;h=ba3e5f0cb50374882c2d864dc780ca54eba83d90;hb=aacc3913d8f710d27a09155af6d722cb29367b6b;hp=0940b0261587ba7faf051205365770b385ea5a0d;hpb=bb12a18bafa6e3cd4f0304d2856a87887c8c9287;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud/panel/quickmenu.qc b/qcsrc/client/hud/panel/quickmenu.qc index 0940b0261..ba3e5f0cb 100644 --- a/qcsrc/client/hud/panel/quickmenu.qc +++ b/qcsrc/client/hud/panel/quickmenu.qc @@ -1,5 +1,8 @@ #include "quickmenu.qh" +#include +#include +#include #include #include #include @@ -41,7 +44,7 @@ float QuickMenu_TimeOut; void QuickMenu_Page_LoadEntry(int i, string s, string s1) { TC(int, i); - //printf("^xc80 entry %d: %s, %s\n", i, s, s1); + //LOG_INFOF("^xc80 entry %d: %s, %s\n", i, s, s1); if (QuickMenu_Page_Description[i]) strunzone(QuickMenu_Page_Description[i]); QuickMenu_Page_Description[i] = strzone(s); @@ -80,12 +83,12 @@ bool QuickMenu_Open(string mode, string submenu, string file) if(mode == "file") { if(file == "" || file == "0") - LOG_INFO("No file name is set in hud_panel_quickmenu_file, loading default quickmenu\n"); + LOG_INFO("No file name is set in hud_panel_quickmenu_file, loading default quickmenu"); else { fh = fopen(file, FILE_READ); if(fh < 0) - LOG_INFOF("Couldn't open file \"%s\", loading default quickmenu\n", file); + LOG_INFOF("Couldn't open file \"%s\", loading default quickmenu", file); } if(fh < 0) mode = "default"; @@ -286,11 +289,11 @@ bool QuickMenu_Page_Load(string target_submenu, bool new_page) s = QuickMenu_Buffer_Get(); if(substring(s, 0, 1) == QM_TAG_SUBMENU && substring(s, 1, -1) == z_submenu) { - // printf("^3 beginning of %s\n", z_submenu); + //LOG_INFOF("^3 beginning of %s\n", z_submenu); ++QuickMenu_Buffer_Index; break; // target_submenu found! } - // printf("^1 skipping %s\n", s); + //LOG_INFOF("^1 skipping %s\n", s); } if(QuickMenu_Buffer_Index == QuickMenu_Buffer_Size) LOG_WARNF("Couldn't find submenu \"%s\"", z_submenu); @@ -307,7 +310,7 @@ bool QuickMenu_Page_Load(string target_submenu, bool new_page) if(z_submenu != "" && substring(s, 1, -1) == z_submenu) { - // printf("^3 end of %s\n", z_submenu); + //LOG_INFOF("^3 end of %s\n", z_submenu); break; } @@ -332,28 +335,32 @@ bool QuickMenu_Page_Load(string target_submenu, bool new_page) QuickMenu_Page_LoadEntry(QuickMenu_Page_Entries, substring(s, 1, -1), ""); QuickMenu_skip_submenu(substring(s, 1, -1)); } - else if(entry_num >= first_entry && substring(s, 0, 1) == QM_TAG_TITLE) + else if(substring(s, 0, 1) == QM_TAG_TITLE) { ++QuickMenu_Buffer_Index; - cmd = QuickMenu_Buffer_Get(); - string command_code = substring(cmd, 0, 1); - if(command_code == QM_TAG_COMMAND) - cmd = substring(cmd, 1, -1); - else if(command_code == QM_TAG_PLCOMMAND) + if(entry_num >= first_entry) { - // throw away the current quickmenu buffer and load a new one - cmd = substring(cmd, 1, -1); - strunzone(z_submenu); - if(HUD_Quickmenu_PlayerListEntries_Create(cmd, stof(substring(s, 1, 1)), stof(substring(s, 2, 1)))) - return QuickMenu_Page_Load("", 0); - QuickMenu_Close(); - return false; - } + cmd = QuickMenu_Buffer_Get(); + string command_code = substring(cmd, 0, 1); + if(command_code == QM_TAG_COMMAND) + cmd = substring(cmd, 1, -1); + else if(command_code == QM_TAG_PLCOMMAND) + { + // throw away the current quickmenu buffer and load a new one + cmd = substring(cmd, 1, -1); + strunzone(z_submenu); + if(HUD_Quickmenu_PlayerListEntries_Create(cmd, stof(substring(s, 1, 1)), stof(substring(s, 2, 1)))) + return QuickMenu_Page_Load("", 0); + QuickMenu_Close(); + return false; + } + + tokenize_console(cmd); + QuickMenu_Page_Command_Type[QuickMenu_Page_Entries] = (argv(1) && argv(0) == "toggle"); - tokenize_console(cmd); - QuickMenu_Page_Command_Type[QuickMenu_Page_Entries] = (argv(1) && argv(0) == "toggle"); + QuickMenu_Page_LoadEntry(QuickMenu_Page_Entries, substring(s, 1, -1), cmd); + } - QuickMenu_Page_LoadEntry(QuickMenu_Page_Entries, substring(s, 1, -1), cmd); } ++entry_num; @@ -516,10 +523,10 @@ void QuickMenu_Mouse() if (mousepos.x >= panel_pos.x && mousepos.y >= first_entry_pos && mousepos.x <= panel_pos.x + panel_size.x && mousepos.y <= first_entry_pos + entries_height) { - float entry_num; - entry_num = floor((mousepos.y - first_entry_pos) / fontsize.y); + int entry_num = min(QuickMenu_Page_Entries - 1, floor((mousepos.y - first_entry_pos) / fontsize.y)); if (QuickMenu_IsLastPage || entry_num != QUICKMENU_MAXLINES - 2) { + // recycling panel_pos as entry_pos panel_pos.y = first_entry_pos + entry_num * fontsize.y; vector color; if(mouseClicked & S_MOUSE1) @@ -528,7 +535,7 @@ void QuickMenu_Mouse() color = '1 1 0.3'; else color = '1 1 1'; - drawfill(panel_pos, eX * panel_size.x + eY * fontsize.y, color, .2, DRAWFLAG_NORMAL); + drawfill(panel_pos, vec2(panel_size.x, fontsize.y), color, .2, DRAWFLAG_NORMAL); if(!mouseClicked && (prevMouseClicked & S_MOUSE1)) QuickMenu_Page_ActiveEntry((entry_num < QUICKMENU_MAXLINES - 1) ? entry_num + 1 : 0); @@ -552,7 +559,7 @@ void HUD_Quickmenu_DrawEntry(vector pos, string desc, string option, vector font pic = strcat("gfx/hud/default/", option); vector option_size = '1 1 0' * fontsize.y * 0.8; desc_width -= option_size.x; - drawpic(pos + eX * desc_width + eY * (fontsize.y - option_size.y) / 2, pic, option_size, '1 1 1', panel_fg_alpha, DRAWFLAG_ADDITIVE); + drawpic(pos + vec2(desc_width, (fontsize.y - option_size.y) / 2), pic, option_size, '1 1 1', panel_fg_alpha, DRAWFLAG_ADDITIVE); desc_width -= fontsize.x / 4; } entry = textShortenToWidth(desc, desc_width, fontsize, stringwidth_colors); @@ -682,7 +689,7 @@ void HUD_QuickMenu() if(QuickMenu_Page_ActivatedEntry_Time && time < QuickMenu_Page_ActivatedEntry_Time && QuickMenu_Page_ActivatedEntry == i) - drawfill(panel_pos, eX * panel_size.x + eY * fontsize.y, '0.5 1 0.5', .2, DRAWFLAG_NORMAL); + drawfill(panel_pos, vec2(panel_size.x, fontsize.y), '0.5 1 0.5', .2, DRAWFLAG_NORMAL); panel_pos.y += fontsize.y; } @@ -740,12 +747,19 @@ void HUD_QuickMenu() // useful to Translate a string inside the Command #define QUICKMENU_ENTRY_TC(title,command,text,translated_text) {\ - if(prvm_language == "en") \ - QUICKMENU_ENTRY(title, sprintf(command, text)) \ - else if(!autocvar_hud_panel_quickmenu_translatecommands || translated_text == text) \ - QUICKMENU_ENTRY(strcat("(en)", title), sprintf(command, text)) \ - else \ - QUICKMENU_ENTRY(strcat("(", prvm_language, ")", title), sprintf(command, translated_text)) \ + if(prvm_language == "en") { \ + tc_title = title; \ + tc_cmd = sprintf(command, text); \ + } \ + else if(!autocvar_hud_panel_quickmenu_translatecommands || translated_text == text) { \ + tc_title = strcat("(en)", title); \ + tc_cmd = sprintf(command, text); \ + } \ + else { \ + tc_title = strcat("(", prvm_language, ")", title); \ + tc_cmd = sprintf(command, translated_text); \ + } \ + QUICKMENU_ENTRY(tc_title, tc_cmd) \ } void HUD_Quickmenu_PlayerListEntries(string cmd, int teamplayers, bool without_me) @@ -781,11 +795,16 @@ void QuickMenu_Default(string target_submenu) if(target_submenu != "") QuickMenu_Buffer_Size = QUICKMENU_BUFFER_MAXENTRIES; // forbids load of next entries until target_submenu - QUICKMENU_SMENU(CTX(_("QMCMD^Chat")), "Chat") + string tc_title; + string tc_cmd; + + QUICKMENU_SMENU(_("Chat"), "Chat") QUICKMENU_ENTRY_TC(CTX(_("QMCMD^nice one")), "say %s", ":-) / nice one", CTX(_("QMCMD^:-) / nice one"))) QUICKMENU_ENTRY_TC(CTX(_("QMCMD^good game")), "say %s", "good game", CTX(_("QMCMD^good game"))) QUICKMENU_ENTRY_TC(CTX(_("QMCMD^hi / good luck")), "say %s", "hi / good luck and have fun", CTX(_("QMCMD^hi / good luck and have fun"))) - QUICKMENU_SMENU(CTX(_("QMCMD^Chat")), "Chat") + if(prvm_language != "en") + QUICKMENU_ENTRY(CTX(_("QMCMD^Send in English")), "toggle hud_panel_quickmenu_translatecommands 0 1; quickmenu; wait; quickmenu default Chat") + QUICKMENU_SMENU(_("Chat"), "Chat") if(teamplay) { @@ -801,9 +820,9 @@ void QuickMenu_Default(string target_submenu) QUICKMENU_ENTRY_TC(CTX(_("QMCMD^defending, icon")), "say_team %s; g_waypointsprite_team_here", "defending (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)", CTX(_("QMCMD^defending (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)"))) QUICKMENU_ENTRY_TC(CTX(_("QMCMD^roaming, icon")), "say_team %s; g_waypointsprite_team_here", "roaming (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)", CTX(_("QMCMD^roaming (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)"))) QUICKMENU_ENTRY_TC(CTX(_("QMCMD^attacking, icon")), "say_team %s; g_waypointsprite_team_here", "attacking (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)", CTX(_("QMCMD^attacking (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)"))) - QUICKMENU_ENTRY_TC(CTX(_("QMCMD^killed flag, icon")), "say_team %s; g_waypointsprite_team_here_p", "killed flagcarrier (l:%y^7)", CTX(_("QMCMD^killed flagcarrier (l:%y^7)"))) + QUICKMENU_ENTRY_TC(CTX(_("QMCMD^killed flagcarrier, icon")), "say_team %s; g_waypointsprite_team_here_p", "killed flagcarrier (l:%y^7)", CTX(_("QMCMD^killed flagcarrier (l:%y^7)"))) QUICKMENU_ENTRY_TC(CTX(_("QMCMD^dropped flag, icon")), "say_team %s; g_waypointsprite_team_here_d", "dropped flag (l:%d^7)", CTX(_("QMCMD^dropped flag (l:%d^7)"))) - QUICKMENU_ENTRY_TC(CTX(_("QMCMD^drop gun, icon")), "say_team %s; g_waypointsprite_team_here; wait; dropweapon", "dropped gun %w^7 (l:%l^7)", CTX(_("QMCMD^dropped gun %w^7 (l:%l^7)"))) + QUICKMENU_ENTRY_TC(CTX(_("QMCMD^drop weapon, icon")), "say_team %s; g_waypointsprite_team_here; wait; dropweapon", "dropped gun %w^7 (l:%l^7)", CTX(_("QMCMD^dropped weapon %w^7 (l:%l^7)"))) QUICKMENU_ENTRY_TC(CTX(_("QMCMD^drop flag/key, icon")), "say_team %s; g_waypointsprite_team_here; wait; use", "dropped flag/key %w^7 (l:%l^7)", CTX(_("QMCMD^dropped flag/key %w^7 (l:%l^7)"))) QUICKMENU_SMENU(CTX(_("QMCMD^Team chat")), "Team chat") } @@ -845,8 +864,6 @@ void QuickMenu_Default(string target_submenu) } QUICKMENU_ENTRY(CTX(_("QMCMD^Fullscreen")), "toggle vid_fullscreen; vid_restart") - if(prvm_language != "en") - QUICKMENU_ENTRY(CTX(_("QMCMD^Translate chat messages")), "toggle hud_panel_quickmenu_translatecommands") QUICKMENU_SMENU(CTX(_("QMCMD^Settings")), "Settings") QUICKMENU_SMENU(CTX(_("QMCMD^Call a vote")), "Call a vote") @@ -863,9 +880,9 @@ void QuickMenu_Default(string target_submenu) if(target_submenu != "" && !target_submenu_found) { - LOG_WARNF("Couldn't find submenu \"%s\"", target_submenu); + LOG_INFOF("Couldn't find submenu \"%s\"", target_submenu); if(prvm_language != "en") - LOG_WARNF("^3Warning: submenu must be in English", target_submenu); + LOG_INFOF("^3Warning: submenu title must be in English", target_submenu); QuickMenu_Buffer_Size = 0; } }