X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fcommand%2Fmenu_cmd.qc;h=c4593e87aa1a90181c8d555513c2bc89af92a8f4;hb=a293c700fbbf3a18f25f08c1837fa4f29e8e360b;hp=8b12a7b7ddbe6289b0f722ed661ab468a954a9ea;hpb=9e6de751aaa2a918708f80735a006a03e84f2fcf;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc
index 8b12a7b7d..c4593e87a 100644
--- a/qcsrc/menu/command/menu_cmd.qc
+++ b/qcsrc/menu/command/menu_cmd.qc
@@ -1,9 +1,11 @@
 #include "menu_cmd.qh"
 
 #include "../menu.qh"
-#include "../oo/classes.qc"
+#include "../item.qh"
 
-#include "../../common/command/generic.qh"
+#include <menu/mutators/_mod.qh>
+
+#include <common/command/_mod.qh>
 
 .entity firstChild, nextSibling;
 
@@ -12,25 +14,25 @@ void _dumptree_open(entity pass, entity me)
 {
 	string s;
 	s = me.toString(me);
-	if(s == "")
-		s = me.classname;
-	else
-		s = strcat(me.classname, ": ", s);
-	LOG_INFO(_dumptree_space, etos(me), " (", s, ")");
-	if(me.firstChild)
+	if (s == "") s = me.classname;
+	else s = strcat(me.classname, ": ", 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)
 {
-	if(me.firstChild)
+	if (me.firstChild)
 	{
 		_dumptree_space = substring(_dumptree_space, 0, strlen(_dumptree_space) - 2);
-		LOG_INFO(_dumptree_space, "}\n");
+		print(_dumptree_space, "}\n");
 	}
 }
 
@@ -38,97 +40,93 @@ float updateConwidths(float width, float height, float pixelheight);
 
 void GameCommand(string theCommand)
 {
-	float argc;
-	argc = tokenize_console(theCommand);
+	int argc = tokenize_console(theCommand);
+	string ss = strtolower(argv(0));
 
-	if(argv(0) == "help" || argc == 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:\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_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("\nGeneric commands shared by all programs:\n");
+		LOG_HELP("\nGeneric commands shared by all programs:");
 		GenericCommand_macro_help();
 
 		return;
 	}
 
-	if(GenericCommand(theCommand))
-		return;
+	if (GenericCommand(theCommand)) return;
 
-	if(argv(0) == "sync")
+	if (argv(0) == "sync")
 	{
 		m_sync();
 		return;
 	}
 
-	if(argv(0) == "update_conwidths_before_vid_restart")
+	if (argv(0) == "update_conwidths_before_vid_restart")
 	{
 		updateConwidths(cvar("vid_width"), cvar("vid_height"), cvar("vid_pixelheight"));
 		return;
 	}
 
-	if(argv(0) == "directmenu" || argv(0) == "directpanelhudmenu")
+	if (argv(0) == "directmenu" || argv(0) == "directpanelhudmenu")
 	{
 		string filter = string_null;
-		if(argv(0) == "directpanelhudmenu")
-			filter = strzone("HUD");
+		if (argv(0) == "directpanelhudmenu") filter = "HUD";
 
-		if(argc == 1)
+		if (argc == 1)
 		{
-			LOG_INFO(_("Available options:\n"));
-			float i;
-			entity e;
-			string s;
+			LOG_HELP("Available items:");
 
-			for(i = 0, e = world; (e = nextent(e)); )
-				if(e.classname != "vtbl" && e.name != "")
+			FOREACH_ENTITY_ORDERED(it.name != "", {
+				if (it.classname == "vtbl") continue;
+				string s = it.name;
+				if (filter)
 				{
-					s = e.name;
-					if(filter)
-					{
-						if(substring(s, 0, strlen(filter)) != filter)
-							continue;
-						s = substring(s, strlen(filter), strlen(s) - strlen(filter));
-					}
-					LOG_INFO(strcat(" ", s ,"\n"));
-					++i;
+					if (!startsWith(s, filter)) continue;
+					s = substring(s, strlen(filter), strlen(s) - strlen(filter));
 				}
+				LOG_HELP(" ", s);
+			});
 		}
-		else if(argc == 2 && !isdemo()) // don't allow this command in demos
+		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;
 	}
 
-	if(argv(0) == "skinselect")
+	if (argv(0) == "skinselect")
 	{
 		m_goto("skinselector");
 		return;
 	}
 
-	if(argv(0) == "languageselect")
+	if (argv(0) == "languageselect")
 	{
 		m_goto("languageselector");
 		return;
 	}
 
-	if(argv(0) == "videosettings")
+	if (argv(0) == "videosettings")
 	{
 		m_goto("videosettings");
 		return;
 	}
 
-	if(argv(0) == "dumptree")
+	if (argv(0) == "dumptree")
 	{
 		_dumptree_space = "";
 		depthfirst(main, parent, firstChild, nextSibling, _dumptree_open, _dumptree_close, NULL);
 		return;
 	}
 
-	LOG_INFO(_("Invalid command. For a list of supported commands, try menu_cmd help.\n"));
+	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.");
 }