X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fcommand%2Fgeneric.qc;h=929d3765345084e1e85917705e498417e46563c0;hp=7ef5cb64e5fad9d336c929c0150887c61511dbef;hb=HEAD;hpb=6ae488fa94396ad9ffa0dc3dbfbedb54c8b7983a

diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc
index 7ef5cb64e..3ce25e26d 100644
--- a/qcsrc/common/command/generic.qc
+++ b/qcsrc/common/command/generic.qc
@@ -1,24 +1,24 @@
 #include "generic.qh"
-#include "_mod.qh"
-#include "reg.qh"
 
-#include "markup.qh"
-#include "rpn.qh"
-
-#include "../mapinfo.qh"
-
-#ifdef GAMEQC
-	#include "../notifications/all.qh"
-#endif
-
-#ifdef CSQC
+#if defined(CSQC)
 	#include <client/command/cl_cmd.qh>
-#endif
-
-#ifdef SVQC
-	#include <server/command/_mod.qh>
+	#include <common/command/_mod.qh>
+	#include <common/command/markup.qh>
+	#include <common/command/reg.qh>
+	#include <common/command/rpn.qh>
+	#include <common/mapinfo.qh>
+	#include <common/notifications/all.qh>
+#elif defined(MENUQC)
+#elif defined(SVQC)
+	#include <common/command/_mod.qh>
+	#include <common/command/markup.qh>
+	#include <common/command/reg.qh>
+	#include <common/command/rpn.qh>
+	#include <common/mapinfo.qh>
+	#include <common/notifications/all.qh>
 	#include <common/turrets/config.qh>
 	#include <common/weapons/config.qh>
+	#include <server/command/_mod.qh>
 #endif
 
 // =========================================================
@@ -89,8 +89,8 @@ void GenericCommand_addtolist(int request, int argc)
 			LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
 		case CMD_REQUEST_USAGE:
 		{
-			LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " addtolist variable value");
-			LOG_HELP("  Where 'variable' is what to add 'value' to.");
+			LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " addtolist <cvar> <value>");
+			LOG_HELP("  Where <cvar> is the cvar to add <value> to.");
 			LOG_HELP("See also: ^2removefromlist^7");
 			return;
 		}
@@ -163,7 +163,7 @@ void GenericCommand_qc_curl(int request, int argc)
 		default:
 		case CMD_REQUEST_USAGE:
 		{
-			LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " qc_curl [--key N] [--cvar] [--exec] URL [postargs...]");
+			LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " qc_curl [--key <n>] [--cvar] [--exec] <url> [<postargs>]");
 			return;
 		}
 	}
@@ -274,11 +274,13 @@ void GenericCommand_maplist(int request, int argc)
 				{
 					if(argc == 3)
 					{
+						// save argv(2) from being overridden by tokenize engine call
+						string del_map_name = argv(2);
 						argc = tokenizebyseparator(cvar_string("g_maplist"), " ");
 
 						tmp_string = "";
 						for(i = 0; i < argc; ++i)
-							if(argv(i) != argv(2))
+							if(argv(i) != del_map_name)
 								tmp_string = strcat(tmp_string, " ", argv(i));
 
 						tmp_string = substring(tmp_string, 1, strlen(tmp_string) - 1);
@@ -303,10 +305,10 @@ void GenericCommand_maplist(int request, int argc)
 			LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
 		case CMD_REQUEST_USAGE:
 		{
-			LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " maplist action [map]");
-			LOG_HELP("  Where 'action' is the command to complete,");
-			LOG_HELP("  and 'map' is what it acts upon (if required).");
-			LOG_HELP("  Full list of commands here: \"add, cleanup, remove, shuffle.\"");
+			LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " maplist <action> [<map>]");
+			LOG_HELP("  Where <action> is the command to complete,");
+			LOG_HELP("  and <map> is what it acts upon (for the 'add' and 'remove' actions).");
+			LOG_HELP("  Full list of commands here: add, cleanup, remove, shuffle.");
 			return;
 		}
 	}
@@ -325,8 +327,8 @@ void GenericCommand_nextframe(int request, string command)
 		default:
 		case CMD_REQUEST_USAGE:
 		{
-			LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " nextframe command...");
-			LOG_HELP("  Where command will be executed next frame of this VM");
+			LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " nextframe <command>");
+			LOG_HELP("  Where <command> will be executed next frame of this VM");
 			return;
 		}
 	}
@@ -359,8 +361,8 @@ void GenericCommand_removefromlist(int request, int argc)
 			LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
 		case CMD_REQUEST_USAGE:
 		{
-			LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " removefromlist variable value");
-			LOG_HELP("  Where 'variable' is what cvar to remove 'value' from.");
+			LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " removefromlist <cvar> <value>");
+			LOG_HELP("  Where <cvar> is the cvar to remove <value> from.");
 			LOG_HELP("See also: ^2addtolist^7");
 			return;
 		}
@@ -409,7 +411,7 @@ void GenericCommand_restartnotifs(int request)
 			Destroy_All_Notifications();
 			CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
 			#else
-			LOG_INFO(_("Notification restart command only works with cl_cmd and sv_cmd."));
+			LOG_INFO("Notification restart command only works with cl_cmd and sv_cmd.");
 			#endif
 			return;
 		}
@@ -447,8 +449,8 @@ void GenericCommand_settemp(int request, int argc)
 			LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0));
 		case CMD_REQUEST_USAGE:
 		{
-			LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " settemp \"cvar\" \"arguments\"");
-			LOG_HELP("  Where 'cvar' is the cvar you want to temporarily set with 'arguments'.");
+			LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " settemp <cvar> \"<arguments>\"");
+			LOG_HELP("  Where <cvar> is the cvar you want to temporarily set with <arguments>.");
 			LOG_HELP("See also: ^2settemp_restore^7");
 			return;
 		}
@@ -502,7 +504,7 @@ void GenericCommand_runtest(int request, int argc)
 		default:
 		case CMD_REQUEST_USAGE:
 		{
-			LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " [function to run]");
+			LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " <function>");
 			return;
 		}
 	}