Merge branch 'master' into Mario/speed_var

[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 18e5ae08123ff999f479c896f2eadc79de4972d6..bb55a671bad802feb51cc1e4fb1dcd3be92ade08 100644 (file)
--- a/qcsrc/menu/command/menu_cmd.qc
+++ b/qcsrc/menu/command/menu_cmd.qc
@@ -3,7 +3,7 @@
 #include "../menu.qh"
 #include "../item.qh"
 
-#include "../mutators/events.qh"
+#include <menu/mutators/_mod.qh>
 
 #include <common/command/_mod.qh>
 
@@ -45,11 +45,12 @@ void GameCommand(string theCommand)
 
        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_HELP(_("Usage: menu_cmd command..., where possible commands are:"));
+               LOG_HELP(_("  sync - reloads all cvars on the current menu page"));
+               LOG_HELP(_("  directmenu ITEM - select a menu item as main item"));
+               LOG_HELP(_("  dumptree - dump 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;
@@ -76,7 +77,7 @@ void GameCommand(string theCommand)
 
                if (argc == 1)
                {
-                       LOG_INFO(_("Available options:"));
+                       LOG_HELP(_("Available options:"));
 
                        FOREACH_ENTITY_ORDERED(it.name != "", {
                                if (it.classname == "vtbl") continue;
@@ -86,7 +87,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