Fix #2579 "Persistent devastator arena after Level 25" when starting a map with the...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / command / menu_cmd.qc

diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc
index a06ac8e23100f7ffbc98312edba482164aec1c77..c4593e87aa1a90181c8d555513c2bc89af92a8f4 100644 (file)
--- a/qcsrc/menu/command/menu_cmd.qc
+++ b/qcsrc/menu/command/menu_cmd.qc
@@ -43,15 +43,16 @@ void GameCommand(string theCommand)
        int argc = tokenize_console(theCommand);
        string ss = strtolower(argv(0));
 
+       // TODO port these commands to the command system
        if (argv(0) == "help" || argc == 0)
        {
-               LOG_INFO(_("Usage: menu_cmd command..., where possible commands are:"));
-               LOG_INFO(_("  sync - reloads all cvars on the current menu page"));
-               LOG_INFO(_("  directmenu ITEM - select a menu item as main item"));
-               LOG_INFO(_("  dumptree - dump the state of the menu as a tree to the console"));
-               LOG_INFO("\n");
+               LOG_HELP("Usage:^3 menu_cmd <command> [<item>], where possible commands are:");
+               LOG_HELP("  'sync' reloads all cvars on the current menu page");
+               LOG_HELP("  'directmenu' shows the menu window named <item> (or the menu window containing an item named <item>)");
+               LOG_HELP("   if <item> is not specified it shows the list of available items in the console");
+               LOG_HELP("  'dumptree' dumps the state of the menu as a tree to the console");
 
-               LOG_INFO("Generic commands shared by all programs:");
+               LOG_HELP("\nGeneric commands shared by all programs:");
                GenericCommand_macro_help();
 
                return;
@@ -78,7 +79,7 @@ void GameCommand(string theCommand)
 
                if (argc == 1)
                {
-                       LOG_INFO(_("Available options:"));
+                       LOG_HELP("Available items:");
 
                        FOREACH_ENTITY_ORDERED(it.name != "", {
                                if (it.classname == "vtbl") continue;
@@ -88,7 +89,7 @@ void GameCommand(string theCommand)
                                        if (!startsWith(s, filter)) continue;
                                        s = substring(s, strlen(filter), strlen(s) - strlen(filter));
                                }
-                               LOG_INFOF(" %s", s);
+                               LOG_HELP(" ", s);
                        });
                }
                else if (argc == 2 && !isdemo())     // don't allow this command in demos
@@ -127,5 +128,5 @@ void GameCommand(string theCommand)
        if(MUTATOR_CALLHOOK(Menu_ConsoleCommand, ss, argc, theCommand)) // handled by a mutator
                return;
 
-       LOG_INFO(_("Invalid command. For a list of supported commands, try menu_cmd help."));
+       LOG_INFO("Invalid command. For a list of supported commands, try menu_cmd help.");
 }