X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fcommand%2Fmenu_cmd.qc;h=2c0b1edf38aa33fcd42e6117bf4a5c6c108bd04a;hb=0f6085c8ea46125d87ca81ec7f5e82f73c08f958;hp=ea2e4034eb08fadb820ea319ae2e6fa17fca8401;hpb=1d29897965eea7d8713a780fe01d5fcf34fc0b51;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc
index ea2e4034e..2c0b1edf3 100644
--- a/qcsrc/menu/command/menu_cmd.qc
+++ b/qcsrc/menu/command/menu_cmd.qc
@@ -1,9 +1,3 @@
-void GameCommand_Init()
-{
-	// make gg call menu QC theCommands
-	localcmd("alias qc_cmd \"menu_cmd $*\"\n");
-}
-
 string _dumptree_space;
 void _dumptree_open(entity pass, entity me)
 {
@@ -31,35 +25,6 @@ void _dumptree_close(entity pass, entity me)
 	}
 }
 
-float curl_uri_get_pos;
-float curl_uri_get_exec[URI_GET_CURL_END - URI_GET_CURL + 1];
-string curl_uri_get_cvar[URI_GET_CURL_END - URI_GET_CURL + 1];
-void Curl_URI_Get_Callback(float id, float status, string data)
-{
-	float i;
-	float do_exec;
-	string do_cvar;
-	i = id - URI_GET_CURL;
-	do_exec = curl_uri_get_exec[i];
-	do_cvar = curl_uri_get_cvar[i];
-	if(status != 0)
-	{
-		print(sprintf(_("error: status is %d\n"), status));
-		if(do_cvar)
-			strunzone(do_cvar);
-		return;
-	}
-	if(do_exec)
-		localcmd(data);
-	if(do_cvar)
-	{
-		cvar_set(do_cvar, data);
-		strunzone(do_cvar);
-	}
-	if(!do_exec && !do_cvar)
-		print(data);
-}
-
 void GameCommand(string theCommand)
 {
 	float argc;
@@ -70,11 +35,14 @@ void GameCommand(string theCommand)
 		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"));
-		GameCommand_Generic("help");
+
+		print("\nGeneric commands shared by all programs:\n");
+		GenericCommand_macro_help();
+
 		return;
 	}
 
-	if(GameCommand_Generic(theCommand))
+	if(GenericCommand(theCommand))
 		return;
 
 	if(argv(0) == "sync")
@@ -83,36 +51,55 @@ void GameCommand(string theCommand)
 		return;
 	}
 
-	if(argv(0) == "directmenu") if(argc == 2)
+	if(argv(0) == "directmenu" || argv(0) == "directpanelhudmenu")
 	{
-		// switch to a menu item
-		if(!isdemo()) // don't allow this command in demos
-			m_goto(argv(1));
-		return;
-	}
+		string filter = string_null;
+		if(argv(0) == "directpanelhudmenu")
+			filter = strzone("HUD");
 
-	if(argv(0) == "directpanelhudmenu")
-	{
-		// switch to a menu item
-		m_goto(strcat("HUD", argv(1)));
+		if(argc == 1)
+		{
+			print(_("Available options:\n"));
+			float i;
+			entity e;
+			string s;
+
+			for(i = 0, e = world; (e = nextent(e)); )
+				if(e.classname != "vtbl" && e.name != "")
+				{
+					s = e.name;
+					if(filter)
+					{
+						if(substring(s, 0, strlen(filter)) != filter)
+							continue;
+						s = substring(s, strlen(filter), strlen(s) - strlen(filter));
+					}
+					print(strcat(" ", s ,"\n"));
+					++i;
+				}
+		}
+		else if(argc == 2 && !isdemo()) // don't allow this command in demos
+			m_goto(strcat(filter, argv(1))); // switch to a menu item
+		if(filter)
+			strunzone(filter);
 		return;
 	}
 
 	if(argv(0) == "skinselect")
 	{
-		m_goto_skin_selector();
+		m_goto("skinselector");
 		return;
 	}
 
 	if(argv(0) == "languageselect")
 	{
-		m_goto_language_selector();
+		m_goto("languageselector");
 		return;
 	}
 
 	if(argv(0) == "videosettings")
 	{
-		m_goto_video_settings();
+		m_goto("videosettings");
 		return;
 	}
 
@@ -123,71 +110,5 @@ void GameCommand(string theCommand)
 		return;
 	}
 
-	if(argv(0) == "curl")
-	{
-		float do_exec;
-		string do_cvar;
-		float key;
-		float i, j;
-		string url;
-		float buf;
-		float r;
-
-		do_exec = FALSE;
-		do_cvar = string_null;
-		key = -1;
-
-		for(i = 1; i+1 < argc; ++i)
-		{
-			if(argv(i) == "--cvar" && i+2 < argc)
-			{
-				++i;
-				do_cvar = strzone(argv(i));
-				continue;
-			}
-			if(argv(i) == "--exec")
-			{
-				do_exec = TRUE;
-				continue;
-			}
-			if(argv(i) == "--key" && i+2 < argc)
-			{
-				++i;
-				key = stof(argv(i));
-				continue;
-			}
-			break;
-		}
-
-		// now, argv(i) is the URL
-		// following args may be POST parameters
-		url = argv(i);
-		++i;
-		buf = buf_create();
-		j = 0;
-		for(; i+1 < argc; i += 2)
-			bufstr_set(buf, ++j, sprintf("%s=%s", uri_escape(argv(i)), uri_escape(argv(i+1))));
-		if(i < argc)
-			bufstr_set(buf, ++j, sprintf("submit=%s", uri_escape(argv(i))));
-
-		if(j == 0) // no args: GET
-			r = crypto_uri_postbuf(url, URI_GET_CURL + curl_uri_get_pos, string_null, string_null, -1, key);
-		else // with args: POST
-			r = crypto_uri_postbuf(url, URI_GET_CURL + curl_uri_get_pos, "application/x-www-form-urlencoded", "&", buf, key);
-
-		if(r)
-		{
-			curl_uri_get_exec[curl_uri_get_pos] = do_exec;
-			curl_uri_get_cvar[curl_uri_get_pos] = do_cvar;
-			curl_uri_get_pos = mod(curl_uri_get_pos + 1, URI_GET_CURL_END - URI_GET_CURL + 1);
-		}
-		else
-			print(_("error creating curl handle\n"));
-
-		buf_del(buf);
-
-		return;
-	}
-
 	print(_("Invalid command. For a list of supported commands, try menu_cmd help.\n"));
 }