X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fcommand%2Fgeneric.qc;h=8f3449b3e16cfaef91bcc8b0b0bd47171deb8523;hp=a720796ce13821968cbab0722e5ca1d9b141fea5;hb=a73f79e356dd25b6ea678379e7884ee45cc1977b;hpb=aa91709ca58a4c44cdcdee7668bc940831c55b78

diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc
index a720796ce..8f3449b3e 100644
--- a/qcsrc/common/command/generic.qc
+++ b/qcsrc/common/command/generic.qc
@@ -27,19 +27,6 @@
 //  Last updated: February 19th, 2012
 // =========================================================
 
-// used by generic commands for better help/usage information
-string GetProgramCommandPrefix()
-{
-	#ifdef SVQC
-	return "sv_cmd";
-	#endif
-	#ifdef CSQC
-	return "cl_cmd";
-	#endif
-	#ifdef MENUQC
-	return "menu_cmd";
-	#endif
-}
 
 // used by curl command
 void Curl_URI_Get_Callback(int id, float status, string data)
@@ -49,7 +36,7 @@ void Curl_URI_Get_Callback(int id, float status, string data)
 	string do_cvar = curl_uri_get_cvar[i];
 	if(status != 0)
 	{
-		LOG_TRACEF("error: status is %d\n", status);
+		LOG_TRACEF("error: status is %d", status);
 		if(do_cvar)
 			strunzone(do_cvar);
 		return;
@@ -439,9 +426,9 @@ void GenericCommand_settemp(float request, float argc)
 			{
 				float f = cvar_settemp(argv(1), argv(2));
 				if(f == 1)
-					LOG_TRACE("Creating new settemp tracker for ", argv(1), " and setting it to \"", argv(2), "\" temporarily.\n");
+					LOG_TRACE("Creating new settemp tracker for ", argv(1), " and setting it to \"", argv(2), "\" temporarily.");
 				else if(f == -1)
-					LOG_TRACE("Already had a tracker for ", argv(1), ", updating it to \"", argv(2), "\".\n");
+					LOG_TRACE("Already had a tracker for ", argv(1), ", updating it to \"", argv(2), "\".");
 				// else cvar_settemp itself errors out
 
 				return;
@@ -469,9 +456,9 @@ void GenericCommand_settemp_restore(float request, float argc)
 			float i = cvar_settemp_restore();
 
 			if(i)
-				LOG_TRACE("Restored ", ftos(i), " temporary cvar settings to their original values.\n");
+				LOG_TRACE("Restored ", ftos(i), " temporary cvar settings to their original values.");
 			else
-				LOG_TRACE("Nothing to restore.\n");
+				LOG_TRACE("Nothing to restore.");
 
 			return;
 		}
@@ -550,32 +537,32 @@ GENERIC_COMMAND(runtest, "Run unit tests") { GenericCommand_runtest(request, arg
 
 void GenericCommand_macro_help()
 {
-	FOREACH(GENERIC_COMMANDS, true, LAMBDA(LOG_INFOF("  ^2%s^7: %s\n", it.m_name, it.m_description)));
+	FOREACH(GENERIC_COMMANDS, true, LOG_INFOF("  ^2%s^7: %s\n", it.m_name, it.m_description));
 }
 
 float GenericCommand_macro_command(float argc, string command)
 {
 	string c = strtolower(argv(0));
-	FOREACH(GENERIC_COMMANDS, it.m_name == c, LAMBDA(
-		it.m_invokecmd(CMD_REQUEST_COMMAND, NULL, argc, command);
+	FOREACH(GENERIC_COMMANDS, it.m_name == c, {
+		it.m_invokecmd(it, CMD_REQUEST_COMMAND, NULL, argc, command);
 		return true;
-	));
+	});
 	return false;
 }
 
 float GenericCommand_macro_usage(float argc)
 {
 	string c = strtolower(argv(1));
-	FOREACH(GENERIC_COMMANDS, it.m_name == c, LAMBDA(
-		it.m_invokecmd(CMD_REQUEST_USAGE, NULL, argc, "");
+	FOREACH(GENERIC_COMMANDS, it.m_name == c, {
+		it.m_invokecmd(it, CMD_REQUEST_USAGE, NULL, argc, "");
 		return true;
-	));
+	});
 	return false;
 }
 
 void GenericCommand_macro_write_aliases(float fh)
 {
-	FOREACH(GENERIC_COMMANDS, true, LAMBDA(CMD_Write_Alias("qc_cmd_svmenu", it.m_name, it.m_description)));
+	FOREACH(GENERIC_COMMANDS, true, CMD_Write_Alias("qc_cmd_svmenu", it.m_name, it.m_description));
 }