+#include "quickmenu.qh"
+
+#include "hud/all.qh"
+#include "mapvoting.qh"
+
// QUICKMENU_MAXLINES must be <= 10
const int QUICKMENU_MAXLINES = 10;
-// visible etries are loaded from QuickMenu_Buffer into QuickMenu_Page_* arrays
+// visible entries are loaded from QuickMenu_Buffer into QuickMenu_Page_* arrays
string QuickMenu_Page_Command[QUICKMENU_MAXLINES];
string QuickMenu_Page_Description[QUICKMENU_MAXLINES];
+int QuickMenu_Page_Command_Type[QUICKMENU_MAXLINES];
int QuickMenu_Page_Entries;
int QuickMenu_Page;
int QuickMenu_Page_ActivatedEntry = -1;
int QuickMenu_Buffer_Index;
string QuickMenu_CurrentSubMenu;
float QuickMenu_TimeOut;
+
+// QuickMenu_Buffer are labeled with these tags
+#define QM_TAG_TITLE "T"
+#define QM_TAG_SUBMENU "S"
+#define QM_TAG_COMMAND "C"
+#define QM_TAG_PLCOMMAND "P"
+
+#define QuickMenu_Buffer_Set(tag, string) bufstr_set(QuickMenu_Buffer, QuickMenu_Buffer_Size, strcat(tag, string))
+#define QuickMenu_Buffer_Get() bufstr_get(QuickMenu_Buffer, QuickMenu_Buffer_Index)
+
// if s1 is not empty s will be displayed as command otherwise as submenu
-void HUD_QuickMenu_Page_LoadEntry(int i, string s, string s1)
+void QuickMenu_Page_LoadEntry(int i, string s, string s1)
{
//printf("^xc80 entry %d: %s, %s\n", i, s, s1);
if (QuickMenu_Page_Description[i])
strunzone(QuickMenu_Page_Command[i]);
QuickMenu_Page_Command[i] = strzone(s1);
}
-void HUD_QuickMenu_Page_ClearEntry(int i)
+
+void QuickMenu_Page_ClearEntry(int i)
{
if (QuickMenu_Page_Description[i])
strunzone(QuickMenu_Page_Description[i]);
QuickMenu_Page_Command[i] = string_null;
}
-float HUD_QuickMenu_Page_Load(string target_submenu, float new_page);
-void HUD_QuickMenu_Default(string submenu);
-bool HUD_QuickMenu_Open(string mode, string submenu)
+float QuickMenu_Page_Load(string target_submenu, float new_page);
+void QuickMenu_Default(string submenu);
+bool QuickMenu_Open(string mode, string submenu)
{
int fh = -1;
string s;
mode = "file";
}
+ if(mode == "file")
+ {
+ if(autocvar_hud_panel_quickmenu_file == "" || autocvar_hud_panel_quickmenu_file == "0")
+ LOG_INFO("No file name is set in hud_panel_quickmenu_file, loading default quickmenu\n");
+ else
+ {
+ fh = fopen(autocvar_hud_panel_quickmenu_file, FILE_READ);
+ if(fh < 0)
+ LOG_INFOF("Couldn't open file \"%s\", loading default quickmenu\n", autocvar_hud_panel_quickmenu_file);
+ }
+ if(fh < 0)
+ mode = "default";
+ }
+
if(mode == "default")
{
QuickMenu_Buffer = buf_create();
if(QuickMenu_Buffer < 0)
return false;
- HUD_QuickMenu_Default(submenu);
+ QuickMenu_Default(submenu);
}
else if(mode == "file")
{
- if(autocvar_hud_panel_quickmenu_file != "")
- if(autocvar_hud_panel_quickmenu_file != "0")
- fh = fopen(autocvar_hud_panel_quickmenu_file, FILE_READ);
- if(fh < 0)
- {
- printf("Couldn't open file \"%s\"\n", autocvar_hud_panel_quickmenu_file);
- return false;
- }
-
QuickMenu_Buffer = buf_create();
if(QuickMenu_Buffer < 0)
{
// first skip invalid entries, so we don't check them anymore
float argc;
argc = tokenize_console(s);
- if(argc == 0 || argv(0) == "" || substring(argv(0), 0, 2) == "////")
+ if(argc == 0 || argv(0) == "")
continue;
if(argc == 1)
- bufstr_set(QuickMenu_Buffer, QuickMenu_Buffer_Size, strcat("S", argv(0))); // Submenu
+ QuickMenu_Buffer_Set(QM_TAG_SUBMENU, argv(0));
else if(argc == 2)
{
if(argv(1) == "")
continue;
- bufstr_set(QuickMenu_Buffer, QuickMenu_Buffer_Size, strcat("T", argv(0))); // command Title
+ QuickMenu_Buffer_Set(QM_TAG_TITLE, argv(0));
++QuickMenu_Buffer_Size;
- bufstr_set(QuickMenu_Buffer, QuickMenu_Buffer_Size, strcat("C", argv(1))); // command
+ QuickMenu_Buffer_Set(QM_TAG_COMMAND, argv(1));
}
else if(argc == 3)
{
float teamplayers = 0, without_me = 0;
switch(argv(2))
{
- case "ALLPLAYERS_BUT_ME": without_me = 1;
+ case "ALLPLAYERS_BUT_ME": without_me = 1; // fall through
case "ALLPLAYERS": teamplayers = 0; break;
- case "OWNTEAMPLAYERS_BUT_ME": without_me = 1;
+ case "OWNTEAMPLAYERS_BUT_ME": without_me = 1; // fall through
case "OWNTEAMPLAYERS": teamplayers = 1; break;
case "ENEMYTEAMPLAYERS": teamplayers = 2; break;
default: continue;
if(QuickMenu_Buffer_Size + 3 < QUICKMENU_BUFFER_MAXENTRIES)
{
- bufstr_set(QuickMenu_Buffer, QuickMenu_Buffer_Size, strcat("S", argv(0))); // Submenu
+ QuickMenu_Buffer_Set(QM_TAG_SUBMENU, argv(0));
++QuickMenu_Buffer_Size;
- bufstr_set(QuickMenu_Buffer, QuickMenu_Buffer_Size, strcat("T", ftos(teamplayers), ftos(without_me))); // command arguments
+ QuickMenu_Buffer_Set(QM_TAG_TITLE, strcat(ftos(teamplayers), ftos(without_me))); // put PLCOMMAND arguments in the title string
++QuickMenu_Buffer_Size;
- bufstr_set(QuickMenu_Buffer, QuickMenu_Buffer_Size, strcat("P", argv(1))); // command for each player
+ QuickMenu_Buffer_Set(QM_TAG_PLCOMMAND, argv(1));
++QuickMenu_Buffer_Size;
- bufstr_set(QuickMenu_Buffer, QuickMenu_Buffer_Size, strcat("S", argv(0))); // Submenu
+ QuickMenu_Buffer_Set(QM_TAG_SUBMENU, argv(0));
}
}
++QuickMenu_Buffer_Size;
}
else
{
- printf("Unrecognized mode %s\n", mode);
+ LOG_WARNINGF("Unrecognized mode %s\n", mode);
return false;
}
}
if(mode == "file")
- HUD_QuickMenu_Page_Load(submenu, 0);
+ QuickMenu_Page_Load(submenu, 0);
else
- HUD_QuickMenu_Page_Load("", 0);
+ QuickMenu_Page_Load("", 0);
hud_panel_quickmenu = 1;
if(autocvar_hud_cursormode)
setcursormode(1);
hudShiftState = 0;
- QuickMenu_TimeOut = time + autocvar_hud_panel_quickmenu_time;
+ QuickMenu_TimeOut = ((autocvar_hud_panel_quickmenu_time > 0) ? time + autocvar_hud_panel_quickmenu_time : 0);
return true;
}
-void HUD_QuickMenu_Buffer_Close()
+void QuickMenu_Buffer_Close()
{
if (QuickMenu_Buffer >= 0)
{
}
}
-void HUD_QuickMenu_Close()
+void QuickMenu_Close()
{
if (QuickMenu_CurrentSubMenu)
strunzone(QuickMenu_CurrentSubMenu);
QuickMenu_CurrentSubMenu = string_null;
int i;
for (i = 0; i < QUICKMENU_MAXLINES; ++i)
- HUD_QuickMenu_Page_ClearEntry(i);
+ QuickMenu_Page_ClearEntry(i);
QuickMenu_Page_Entries = 0;
hud_panel_quickmenu = 0;
mouseClicked = 0;
prevMouseClicked = 0;
- HUD_QuickMenu_Buffer_Close();
+ QuickMenu_Buffer_Close();
if(autocvar_hud_cursormode)
if(!mv_active)
}
// It assumes submenu open tag is already detected
-void HUD_QuickMenu_skip_submenu(string submenu)
+void QuickMenu_skip_submenu(string submenu)
{
string s, z_submenu;
z_submenu = strzone(submenu);
for(++QuickMenu_Buffer_Index ; QuickMenu_Buffer_Index < QuickMenu_Buffer_Size; ++QuickMenu_Buffer_Index)
{
- s = bufstr_get(QuickMenu_Buffer, QuickMenu_Buffer_Index);
- if(substring(s, 0, 1) != "S")
+ s = QuickMenu_Buffer_Get();
+ if(substring(s, 0, 1) != QM_TAG_SUBMENU)
continue;
if(substring(s, 1, -1) == z_submenu) // submenu end
break;
- HUD_QuickMenu_skip_submenu(substring(s, 1, -1));
+ QuickMenu_skip_submenu(substring(s, 1, -1));
}
strunzone(z_submenu);
}
-bool HUD_QuickMenu_IsOpened()
+bool QuickMenu_IsOpened()
{
return (QuickMenu_Page_Entries > 0);
}
{
int i;
for(i = 0; i < QUICKMENU_MAXLINES; ++i)
- HUD_QuickMenu_Page_ClearEntry(i);
- HUD_QuickMenu_Buffer_Close();
+ QuickMenu_Page_ClearEntry(i);
+ QuickMenu_Buffer_Close();
QuickMenu_Buffer = buf_create();
if(QuickMenu_Buffer < 0)
// new_page 0 means page 0, new_page != 0 means next page
int QuickMenu_Buffer_Index_Prev;
-bool HUD_QuickMenu_Page_Load(string target_submenu, int new_page)
+bool QuickMenu_Page_Load(string target_submenu, int new_page)
{
string s = string_null, cmd = string_null, z_submenu;
// skip everything until the submenu open tag is found
for( ; QuickMenu_Buffer_Index < QuickMenu_Buffer_Size; ++QuickMenu_Buffer_Index)
{
- s = bufstr_get(QuickMenu_Buffer, QuickMenu_Buffer_Index);
- if(substring(s, 0, 1) == "S" && substring(s, 1, -1) == z_submenu)
+ 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);
++QuickMenu_Buffer_Index;
// printf("^1 skipping %s\n", s);
}
if(QuickMenu_Buffer_Index == QuickMenu_Buffer_Size)
- printf("Couldn't find submenu \"%s\"\n", z_submenu);
+ LOG_WARNINGF("Couldn't find submenu \"%s\"\n", z_submenu);
}
// only the last page can contain up to QUICKMENU_MAXLINES entries
int entry_num = 0; // counts entries in target_submenu
for( ; QuickMenu_Buffer_Index < QuickMenu_Buffer_Size; ++QuickMenu_Buffer_Index)
{
- s = bufstr_get(QuickMenu_Buffer, QuickMenu_Buffer_Index);
+ s = QuickMenu_Buffer_Get();
if(z_submenu != "" && substring(s, 1, -1) == z_submenu)
{
QuickMenu_Buffer_Index_Prev = QuickMenu_Buffer_Index;
else if(QuickMenu_Page_Entries == QUICKMENU_MAXLINES)
{
- HUD_QuickMenu_Page_ClearEntry(QUICKMENU_MAXLINES - 1);
+ QuickMenu_Page_ClearEntry(QUICKMENU_MAXLINES - 1);
QuickMenu_Buffer_Index = QuickMenu_Buffer_Index_Prev;
QuickMenu_IsLastPage = false;
break;
}
// NOTE: entries are loaded starting from 1, not from 0
- if(substring(s, 0, 1) == "S") // submenu
+ if(substring(s, 0, 1) == QM_TAG_SUBMENU)
{
if(entry_num >= first_entry)
- HUD_QuickMenu_Page_LoadEntry(QuickMenu_Page_Entries, substring(s, 1, -1), "");
- HUD_QuickMenu_skip_submenu(substring(s, 1, -1));
+ 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) == "T")
+ else if(entry_num >= first_entry && substring(s, 0, 1) == QM_TAG_TITLE)
{
++QuickMenu_Buffer_Index;
- cmd = bufstr_get(QuickMenu_Buffer, QuickMenu_Buffer_Index);
+ cmd = QuickMenu_Buffer_Get();
string command_code = substring(cmd, 0, 1);
- if(command_code == "C")
+ if(command_code == QM_TAG_COMMAND)
cmd = substring(cmd, 1, -1);
- else if(command_code == "P")
+ 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 HUD_QuickMenu_Page_Load("", 0);
- HUD_QuickMenu_Close();
+ return QuickMenu_Page_Load("", 0);
+ QuickMenu_Close();
return false;
}
- HUD_QuickMenu_Page_LoadEntry(QuickMenu_Page_Entries, substring(s, 1, -1), cmd);
+
+ 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);
}
++entry_num;
strunzone(z_submenu);
if (QuickMenu_Page_Entries == 0)
{
- HUD_QuickMenu_Close();
+ QuickMenu_Close();
return false;
}
- QuickMenu_TimeOut = time + autocvar_hud_panel_quickmenu_time;
+ QuickMenu_TimeOut = ((autocvar_hud_panel_quickmenu_time > 0) ? time + autocvar_hud_panel_quickmenu_time : 0);
return true;
}
-bool HUD_QuickMenu_ActionForNumber(int num)
+bool QuickMenu_ActionForNumber(int num)
{
if (!QuickMenu_IsLastPage)
{
return false;
if (num == 0)
{
- HUD_QuickMenu_Page_Load(QuickMenu_CurrentSubMenu, +1);
+ QuickMenu_Page_Load(QuickMenu_CurrentSubMenu, +1);
return false;
}
} else if (num <= 0 || num > QuickMenu_Page_Entries)
if (QuickMenu_Page_Command[num] != "")
{
localcmd(strcat("\n", QuickMenu_Page_Command[num], "\n"));
+ QuickMenu_TimeOut = ((autocvar_hud_panel_quickmenu_time > 0) ? time + autocvar_hud_panel_quickmenu_time : 0);
return true;
}
if (QuickMenu_Page_Description[num] != "")
- HUD_QuickMenu_Page_Load(QuickMenu_Page_Description[num], 0);
+ QuickMenu_Page_Load(QuickMenu_Page_Description[num], 0);
return false;
}
-void HUD_QuickMenu_Page_ActiveEntry(float entry_num)
+void QuickMenu_Page_ActiveEntry(float entry_num)
{
QuickMenu_Page_ActivatedEntry = entry_num;
QuickMenu_Page_ActivatedEntry_Time = time + 0.1;
- QuickMenu_Page_ActivatedEntry_Close = (!(hudShiftState & S_CTRL));
+ if(QuickMenu_Page_Command[QuickMenu_Page_ActivatedEntry])
+ {
+ bool f = QuickMenu_ActionForNumber(QuickMenu_Page_ActivatedEntry);
+ // toggle commands don't close the quickmenu
+ if(QuickMenu_Page_Command_Type[QuickMenu_Page_ActivatedEntry] == 1)
+ QuickMenu_Page_ActivatedEntry_Close = false;
+ else
+ QuickMenu_Page_ActivatedEntry_Close = (f && !(hudShiftState & S_CTRL));
+ }
+ else
+ QuickMenu_Page_ActivatedEntry_Close = (!(hudShiftState & S_CTRL));
}
-bool HUD_QuickMenu_InputEvent(float bInputType, float nPrimary, float nSecondary)
+bool QuickMenu_InputEvent(float bInputType, float nPrimary, float nSecondary)
{
// we only care for keyboard events
if(bInputType == 2)
return false;
- if(!HUD_QuickMenu_IsOpened() || autocvar__hud_configure || mv_active)
+ if(!QuickMenu_IsOpened() || autocvar__hud_configure || mv_active)
return false;
if(bInputType == 3)
{
- mousepos_x = nPrimary;
- mousepos_y = nSecondary;
+ mousepos.x = nPrimary;
+ mousepos.y = nSecondary;
return true;
}
{
if (bInputType == 1)
return true;
- HUD_QuickMenu_Close();
+ QuickMenu_Close();
}
else if(nPrimary >= '0' && nPrimary <= '9')
{
if (bInputType == 1)
return true;
- HUD_QuickMenu_Page_ActiveEntry(stof(chr2str(nPrimary)));
+ QuickMenu_Page_ActiveEntry(stof(chr2str(nPrimary)));
}
if(nPrimary == K_MOUSE1)
{
return true;
}
-void HUD_QuickMenu_Mouse()
+void QuickMenu_Mouse()
{
if(mv_active) return;
if(!mouseClicked)
if(prevMouseClicked & S_MOUSE2)
{
- HUD_QuickMenu_Close();
+ QuickMenu_Close();
return;
}
{
mousepos = mousepos + getmousepos() * autocvar_menu_mouse_speed;
- mousepos_x = bound(0, mousepos_x, vid_conwidth);
- mousepos_y = bound(0, mousepos_y, vid_conheight);
+ mousepos.x = bound(0, mousepos.x, vid_conwidth);
+ mousepos.y = bound(0, mousepos.y, vid_conheight);
}
HUD_Panel_UpdateCvars();
float first_entry_pos, entries_height;
vector fontsize;
- fontsize = '1 1 0' * (panel_size_y / QUICKMENU_MAXLINES);
- first_entry_pos = panel_pos_y + ((QUICKMENU_MAXLINES - QuickMenu_Page_Entries) * fontsize_y) / 2;
- entries_height = panel_size_y - ((QUICKMENU_MAXLINES - QuickMenu_Page_Entries) * fontsize_y);
+ fontsize = '1 1 0' * (panel_size.y / QUICKMENU_MAXLINES);
+ first_entry_pos = panel_pos.y + ((QUICKMENU_MAXLINES - QuickMenu_Page_Entries) * fontsize.y) / 2;
+ entries_height = panel_size.y - ((QUICKMENU_MAXLINES - QuickMenu_Page_Entries) * fontsize.y);
- 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)
+ 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);
+ entry_num = floor((mousepos.y - first_entry_pos) / fontsize.y);
if (QuickMenu_IsLastPage || entry_num != QUICKMENU_MAXLINES - 2)
{
- panel_pos_y = first_entry_pos + entry_num * fontsize_y;
+ panel_pos.y = first_entry_pos + entry_num * fontsize.y;
vector color;
if(mouseClicked & S_MOUSE1)
color = '0.5 1 0.5';
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, eX * panel_size.x + eY * fontsize.y, color, .2, DRAWFLAG_NORMAL);
if(!mouseClicked && (prevMouseClicked & S_MOUSE1))
- HUD_QuickMenu_Page_ActiveEntry((entry_num < QUICKMENU_MAXLINES - 1) ? entry_num + 1 : 0);
+ QuickMenu_Page_ActiveEntry((entry_num < QUICKMENU_MAXLINES - 1) ? entry_num + 1 : 0);
}
}
prevMouseClicked = mouseClicked;
}
-void HUD_QuickMenu_DrawEntry(vector pos, string s, vector fontsize)
+void HUD_Quickmenu_DrawEntry(vector pos, string desc, string option, vector fontsize)
{
string entry;
float offset;
- entry = textShortenToWidth(s, panel_size_x, fontsize, stringwidth_colors);
+ float desc_width = panel_size.x;
+ if(option)
+ {
+ string pic = strcat(hud_skin_path, "/", option);
+ if(precache_pic(pic) == "")
+ 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);
+ desc_width -= fontsize.x / 4;
+ }
+ entry = textShortenToWidth(desc, desc_width, fontsize, stringwidth_colors);
if (autocvar_hud_panel_quickmenu_align > 0)
{
- offset = (panel_size_x - stringwidth_colors(entry, fontsize)) * min(autocvar_hud_panel_quickmenu_align, 1);
+ float real_desc_width = stringwidth_colors(entry, fontsize);
+ offset = (desc_width - real_desc_width) * min(autocvar_hud_panel_quickmenu_align, 1);
+
+ if(option)
+ {
+ // when there's enough room align description regardless the checkbox
+ float extra_offset = (panel_size.x - desc_width) * min(autocvar_hud_panel_quickmenu_align, 1);
+ if(offset + real_desc_width + extra_offset < desc_width)
+ offset += extra_offset;
+ else
+ offset = max(0, desc_width - real_desc_width);
+ }
drawcolorcodedstring(pos + eX * offset, entry, fontsize, panel_fg_alpha, DRAWFLAG_ADDITIVE);
}
else
drawcolorcodedstring(pos, entry, fontsize, panel_fg_alpha, DRAWFLAG_ADDITIVE);
}
-void HUD_QuickMenu(void)
+void HUD_QuickMenu()
{
if(!autocvar__hud_configure)
{
if (hud_configure_prev && hud_configure_prev != -1)
- HUD_QuickMenu_Close();
+ QuickMenu_Close();
if(!hud_draw_maximized) return;
if(mv_active) return;
//if(!autocvar_hud_panel_quickmenu) return;
if(!hud_panel_quickmenu) return;
+ if(QuickMenu_TimeOut)
if(time > QuickMenu_TimeOut)
{
- HUD_QuickMenu_Close();
+ QuickMenu_Close();
return;
}
}
else
{
- if(!HUD_QuickMenu_IsOpened())
+ if(!QuickMenu_IsOpened())
{
QuickMenu_Page_Entries = 1;
- HUD_QuickMenu_Page_LoadEntry(QuickMenu_Page_Entries, sprintf(_("Submenu%d"), QuickMenu_Page_Entries), "");
+ QuickMenu_Page_LoadEntry(QuickMenu_Page_Entries, sprintf(_("Submenu%d"), QuickMenu_Page_Entries), "");
++QuickMenu_Page_Entries;
- HUD_QuickMenu_Page_LoadEntry(QuickMenu_Page_Entries, sprintf(_("Submenu%d"), QuickMenu_Page_Entries), "");
+ QuickMenu_Page_LoadEntry(QuickMenu_Page_Entries, sprintf(_("Submenu%d"), QuickMenu_Page_Entries), "");
++QuickMenu_Page_Entries;
// although real command doesn't matter here, it must not be empty
// otherwise the entry is displayed like a submenu
for (; QuickMenu_Page_Entries < QUICKMENU_MAXLINES - 1; ++QuickMenu_Page_Entries)
- HUD_QuickMenu_Page_LoadEntry(QuickMenu_Page_Entries, sprintf(_("Command%d"), QuickMenu_Page_Entries), "-");
+ QuickMenu_Page_LoadEntry(QuickMenu_Page_Entries, sprintf(_("Command%d"), QuickMenu_Page_Entries), "-");
++QuickMenu_Page_Entries;
- HUD_QuickMenu_Page_ClearEntry(QuickMenu_Page_Entries);
+ QuickMenu_Page_ClearEntry(QuickMenu_Page_Entries);
QuickMenu_IsLastPage = false;
}
}
int i;
vector fontsize;
string color;
- fontsize = '1 1 0' * (panel_size_y / QUICKMENU_MAXLINES);
+ fontsize = '1 1 0' * (panel_size.y / QUICKMENU_MAXLINES);
if (!QuickMenu_IsLastPage)
{
color = "^5";
- HUD_QuickMenu_DrawEntry(panel_pos + eY * (panel_size_y - fontsize_y), sprintf("%d: %s%s", 0, color, _("Continue...")), fontsize);
+ HUD_Quickmenu_DrawEntry(panel_pos + eY * (panel_size.y - fontsize.y), sprintf("%d: %s%s", 0, color, _("Continue...")), string_null, fontsize);
}
else
- panel_pos_y += ((QUICKMENU_MAXLINES - QuickMenu_Page_Entries) * fontsize_y) / 2;
+ panel_pos.y += ((QUICKMENU_MAXLINES - QuickMenu_Page_Entries) * fontsize.y) / 2;
for (i = 1; i <= QuickMenu_Page_Entries; ++i) {
if (QuickMenu_Page_Description[i] == "")
break;
+ string option = string_null;
if (QuickMenu_Page_Command[i] == "")
color = "^4";
else
+ {
color = "^3";
- HUD_QuickMenu_DrawEntry(panel_pos, sprintf("%d: %s%s", i, color, QuickMenu_Page_Description[i]), fontsize);
+ if(QuickMenu_Page_Command_Type[i] == 1) // toggle command
+ {
+ int end = strstrofs(QuickMenu_Page_Command[i], ";", 0);
+ if(end < 0)
+ tokenize_console(QuickMenu_Page_Command[i]);
+ else
+ tokenize_console(substring(QuickMenu_Page_Command[i], 0, end));
+
+ //if(argv(1) && argv(0) == "toggle") // already checked
+ {
+ // "enable feature xxx" "toggle xxx" (or "toggle xxx 1 0")
+ // "disable feature xxx" "toggle xxx 0 1"
+ float ON_value = 1, OFF_value = 0;
+ if(argv(2))
+ ON_value = stof(argv(2));
+
+ if(argv(3))
+ OFF_value = stof(argv(3));
+ else
+ OFF_value = !ON_value;
+
+ float value = cvar(argv(1));
+ if(value == ON_value)
+ option = "checkbox_checked";
+ else if(value == OFF_value)
+ option = "checkbox_empty";
+ else
+ option = "checkbox_undefined";
+ }
+ }
+ }
+ HUD_Quickmenu_DrawEntry(panel_pos, sprintf("%d: %s%s", i, color, QuickMenu_Page_Description[i]), option, fontsize);
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, eX * panel_size.x + eY * fontsize.y, '0.5 1 0.5', .2, DRAWFLAG_NORMAL);
- panel_pos_y += fontsize_y;
+ panel_pos.y += fontsize.y;
}
if(QuickMenu_Page_ActivatedEntry >= 0 && time >= QuickMenu_Page_ActivatedEntry_Time)
{
- bool f = HUD_QuickMenu_ActionForNumber(QuickMenu_Page_ActivatedEntry);
- if(f && QuickMenu_Page_ActivatedEntry_Close)
- HUD_QuickMenu_Close();
+ if(!QuickMenu_Page_Command[QuickMenu_Page_ActivatedEntry])
+ {
+ bool f = QuickMenu_ActionForNumber(QuickMenu_Page_ActivatedEntry);
+ if(f && QuickMenu_Page_ActivatedEntry_Close)
+ QuickMenu_Close();
+ }
+ else if(QuickMenu_Page_ActivatedEntry_Close)
+ QuickMenu_Close();
QuickMenu_Page_ActivatedEntry = -1;
QuickMenu_Page_ActivatedEntry_Time = 0;
}
if(target_submenu == eng_submenu && target_submenu_found) \
return; /* target_submenu entries are now loaded, exit */ \
if(QuickMenu_Buffer_Size < QUICKMENU_BUFFER_MAXENTRIES) \
- bufstr_set(QuickMenu_Buffer, QuickMenu_Buffer_Size, strcat("S", submenu)); \
+ QuickMenu_Buffer_Set(QM_TAG_SUBMENU, submenu); \
++QuickMenu_Buffer_Size; \
if(target_submenu == eng_submenu && !target_submenu_found) { \
QuickMenu_Buffer_Size = 0; /* enable load of next entries */ \
#define QUICKMENU_ENTRY(title,command) { \
if(QuickMenu_Buffer_Size + 1 < QUICKMENU_BUFFER_MAXENTRIES) \
{ \
- bufstr_set(QuickMenu_Buffer, QuickMenu_Buffer_Size, strcat("T", title)); \
+ QuickMenu_Buffer_Set(QM_TAG_TITLE, title); \
++QuickMenu_Buffer_Size; \
- bufstr_set(QuickMenu_Buffer, QuickMenu_Buffer_Size, strcat("C", command)); \
+ QuickMenu_Buffer_Set(QM_TAG_COMMAND, command); \
} \
++QuickMenu_Buffer_Size; \
}
#define QUICKMENU_SMENU_PL(submenu,eng_submenu,command,teamplayers,without_me) { \
if(QuickMenu_Buffer_Size + 3 < QUICKMENU_BUFFER_MAXENTRIES) {\
QUICKMENU_SMENU(submenu,eng_submenu) \
- bufstr_set(QuickMenu_Buffer, QuickMenu_Buffer_Size, strcat("T", ftos(teamplayers), ftos(without_me))); \
+ QuickMenu_Buffer_Set(QM_TAG_TITLE, strcat(ftos(teamplayers), ftos(without_me))); \
++QuickMenu_Buffer_Size; \
- bufstr_set(QuickMenu_Buffer, QuickMenu_Buffer_Size, strcat("P", command)); \
+ QuickMenu_Buffer_Set(QM_TAG_PLCOMMAND, command); \
++QuickMenu_Buffer_Size; \
QUICKMENU_SMENU(submenu,eng_submenu) \
} \
// Specifying target_submenu, this function only loads entries inside target_submenu
// NOTE: alternatively we could have loaded the whole default quickmenu and
-// then called HUD_QuickMenu_Page_Load(target_submenu, 0);
+// then called QuickMenu_Page_Load(target_submenu, 0);
// but this sytem is more reliable since we can always refer to target_submenu
// with the English title even if a translation is active
-void HUD_QuickMenu_Default(string target_submenu)
+void QuickMenu_Default(string target_submenu)
{
bool target_submenu_found = false;
if(target_submenu != "")
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^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 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_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")
}
- QUICKMENU_SMENU_PL(CTX(_("QMCMD^Send private message to")), "Send private message to", "commandmode tell \"%s\" ^7", 0, 1)
+ QUICKMENU_SMENU_PL(CTX(_("QMCMD^Send private message to")), "Send private message to", "commandmode tell \"%s^7\"", 0, 1)
QUICKMENU_SMENU(CTX(_("QMCMD^Settings")), "Settings")
QUICKMENU_SMENU(CTX(_("QMCMD^View/HUD settings")), "View/HUD settings")
- QUICKMENU_ENTRY(CTX(_("QMCMD^1st/3rd person view")), "toggle chase_active")
- QUICKMENU_ENTRY(CTX(_("QMCMD^Player models like mine on/off")), "toggle cl_forceplayermodels")
- QUICKMENU_ENTRY(CTX(_("QMCMD^Names above players on/off")), "toggle hud_shownames")
- QUICKMENU_ENTRY(CTX(_("QMCMD^Crosshair per weapon on/off")), "toggle crosshair_per_weapon")
- QUICKMENU_ENTRY(CTX(_("QMCMD^FPS on/off")), "toggle hud_panel_engineinfo")
- QUICKMENU_ENTRY(CTX(_("QMCMD^Net graph on/off")), "toggle shownetgraph")
+ QUICKMENU_ENTRY(CTX(_("QMCMD^3rd person view")), "toggle chase_active")
+ QUICKMENU_ENTRY(CTX(_("QMCMD^Player models like mine")), "toggle cl_forceplayermodels")
+ QUICKMENU_ENTRY(CTX(_("QMCMD^Names above players")), "toggle hud_shownames")
+ QUICKMENU_ENTRY(CTX(_("QMCMD^Crosshair per weapon")), "toggle crosshair_per_weapon")
+ QUICKMENU_ENTRY(CTX(_("QMCMD^FPS")), "toggle hud_panel_engineinfo")
+ QUICKMENU_ENTRY(CTX(_("QMCMD^Net graph")), "toggle shownetgraph")
QUICKMENU_SMENU(CTX(_("QMCMD^View/HUD settings")), "View/HUD settings")
QUICKMENU_SMENU(CTX(_("QMCMD^Sound settings")), "Sound settings")
- QUICKMENU_ENTRY(CTX(_("QMCMD^Hit sound on/off")), "toggle cl_hitsound")
- QUICKMENU_ENTRY(CTX(_("QMCMD^Chat sound on/off")), "toggle cl_chatsound")
+ QUICKMENU_ENTRY(CTX(_("QMCMD^Hit sound")), "toggle cl_hitsound")
+ QUICKMENU_ENTRY(CTX(_("QMCMD^Chat sound")), "toggle con_chatsound")
QUICKMENU_SMENU(CTX(_("QMCMD^Sound settings")), "Sound settings")
if(spectatee_status > 0)
QUICKMENU_SMENU(CTX(_("QMCMD^Observer camera")), "Observer camera")
}
- QUICKMENU_ENTRY(CTX(_("QMCMD^toggle fullscreen")), "toggle vid_fullscreen; vid_restart")
+ QUICKMENU_ENTRY(CTX(_("QMCMD^Fullscreen")), "toggle vid_fullscreen; vid_restart")
if(prvm_language != "en")
- QUICKMENU_ENTRY(CTX(_("QMCMD^Translate chat messages on/off")), "toggle hud_panel_quickmenu_translatecommands")
+ 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")
if(target_submenu != "" && !target_submenu_found)
{
- printf("Couldn't find submenu \"%s\"\n", target_submenu);
+ LOG_WARNINGF("Couldn't find submenu \"%s\"\n", target_submenu);
if(prvm_language != "en")
- printf("^3Warning: submenu must be in English\n", target_submenu);
+ LOG_WARNINGF("^3Warning: submenu must be in English\n", target_submenu);
QuickMenu_Buffer_Size = 0;
}
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff