X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fcommand%2Fmenu_cmd.qc;h=8b12a7b7ddbe6289b0f722ed661ab468a954a9ea;hp=c7499e58e40a8a94ba1f31f2c504f0310bb465a3;hb=6cc2d1aa115907d16ae84fb07c3fe6c3329cd9b5;hpb=ee32da5f4dafee5883369c759fe8ed042114bda5 diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc index c7499e58e..8b12a7b7d 100644 --- a/qcsrc/menu/command/menu_cmd.qc +++ b/qcsrc/menu/command/menu_cmd.qc @@ -1,3 +1,12 @@ +#include "menu_cmd.qh" + +#include "../menu.qh" +#include "../oo/classes.qc" + +#include "../../common/command/generic.qh" + +.entity firstChild, nextSibling; + string _dumptree_space; void _dumptree_open(entity pass, entity me) { @@ -7,24 +16,26 @@ void _dumptree_open(entity pass, entity me) s = me.classname; else s = strcat(me.classname, ": ", s); - print(_dumptree_space, etos(me), " (", s, ")"); + LOG_INFO(_dumptree_space, etos(me), " (", s, ")"); if(me.firstChild) { - print(" {\n"); + LOG_INFO(" {\n"); _dumptree_space = strcat(_dumptree_space, " "); } else - print("\n"); + LOG_INFO("\n"); } void _dumptree_close(entity pass, entity me) { if(me.firstChild) { _dumptree_space = substring(_dumptree_space, 0, strlen(_dumptree_space) - 2); - print(_dumptree_space, "}\n"); + LOG_INFO(_dumptree_space, "}\n"); } } +float updateConwidths(float width, float height, float pixelheight); + void GameCommand(string theCommand) { float argc; @@ -32,11 +43,11 @@ void GameCommand(string theCommand) if(argv(0) == "help" || argc == 0) { - print(_("Usage: menu_cmd command..., where possible commands are:\n")); - print(_(" sync - reloads all cvars on the current menu page\n")); - print(_(" directmenu ITEM - select a menu item as main item\n")); + LOG_INFO(_("Usage: menu_cmd command..., where possible commands are:\n")); + LOG_INFO(_(" sync - reloads all cvars on the current menu page\n")); + LOG_INFO(_(" directmenu ITEM - select a menu item as main item\n")); - print("\nGeneric commands shared by all programs:\n"); + LOG_INFO("\nGeneric commands shared by all programs:\n"); GenericCommand_macro_help(); return; @@ -65,7 +76,7 @@ void GameCommand(string theCommand) if(argc == 1) { - print(_("Available options:\n")); + LOG_INFO(_("Available options:\n")); float i; entity e; string s; @@ -80,12 +91,15 @@ void GameCommand(string theCommand) continue; s = substring(s, strlen(filter), strlen(s) - strlen(filter)); } - print(strcat(" ", s ,"\n")); + LOG_INFO(strcat(" ", s ,"\n")); ++i; } } else if(argc == 2 && !isdemo()) // don't allow this command in demos + { + m_play_click_sound(MENU_SOUND_OPEN); m_goto(strcat(filter, argv(1))); // switch to a menu item + } if(filter) strunzone(filter); return; @@ -116,5 +130,5 @@ void GameCommand(string theCommand) return; } - print(_("Invalid command. For a list of supported commands, try menu_cmd help.\n")); + LOG_INFO(_("Invalid command. For a list of supported commands, try menu_cmd help.\n")); }