X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fcommand%2Fmenu_cmd.qc;h=bd45230c97ab61964f43a7153d69242fb896e38c;hb=ec98f5c9d50f267779fed871c9eb094a52064219;hp=0f87cbb0959cb38df039f1cac70f796cabd0185b;hpb=3cfb64730d883ae9ccf0315f365da19345270890;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc
index 0f87cbb09..bd45230c9 100644
--- a/qcsrc/menu/command/menu_cmd.qc
+++ b/qcsrc/menu/command/menu_cmd.qc
@@ -3,9 +3,9 @@
 #include "../menu.qh"
 #include "../item.qh"
 
-#include "../mutators/events.qh"
+#include <menu/mutators/_mod.qh>
 
-#include <common/command/generic.qh>
+#include <common/command/_mod.qh>
 
 .entity firstChild, nextSibling;
 
@@ -16,15 +16,15 @@ void _dumptree_open(entity pass, entity me)
 	s = me.toString(me);
 	if (s == "") s = me.classname;
 	else s = strcat(me.classname, ": ", s);
-	LOG_INFO(_dumptree_space, etos(me), " (", s, ")");
+	print(_dumptree_space, etos(me), " (", s, ")");
 	if (me.firstChild)
 	{
-		LOG_INFO(" {\n");
+		print(" {\n");
 		_dumptree_space = strcat(_dumptree_space, "  ");
 	}
 	else
 	{
-		LOG_INFO("\n");
+		print("\n");
 	}
 }
 void _dumptree_close(entity pass, entity me)
@@ -32,7 +32,7 @@ void _dumptree_close(entity pass, entity me)
 	if (me.firstChild)
 	{
 		_dumptree_space = substring(_dumptree_space, 0, strlen(_dumptree_space) - 2);
-		LOG_INFO(_dumptree_space, "}\n");
+		print(_dumptree_space, "}\n");
 	}
 }
 
@@ -45,11 +45,12 @@ void GameCommand(string theCommand)
 
 	if (argv(0) == "help" || argc == 0)
 	{
-		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"));
+		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("\nGeneric commands shared by all programs:\n");
+		LOG_INFO("Generic commands shared by all programs:");
 		GenericCommand_macro_help();
 
 		return;
@@ -76,7 +77,7 @@ void GameCommand(string theCommand)
 
 		if (argc == 1)
 		{
-			LOG_INFO(_("Available options:\n"));
+			LOG_INFO(_("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\n", s);
+				LOG_INFOF(" %s", s);
 			});
 		}
 		else if (argc == 2 && !isdemo())     // don't allow this command in demos
@@ -125,5 +126,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.\n"));
+	LOG_INFO(_("Invalid command. For a list of supported commands, try menu_cmd help."));
 }