X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fcommand%2Fcl_cmd.qc;h=95032dce7bd4b013ab22701cda09ebf3521486aa;hb=2d2a167c9d4f4ffd8f4234309c936d99e842869b;hp=710e927a25f40a21e3b173fbaddcf58e3dd33e44;hpb=d79891208d5c7c770ef70b4ed5e93c7d7ac4c0d0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/command/cl_cmd.qc b/qcsrc/client/command/cl_cmd.qc
index 710e927a2..95032dce7 100644
--- a/qcsrc/client/command/cl_cmd.qc
+++ b/qcsrc/client/command/cl_cmd.qc
@@ -226,11 +226,15 @@ void LocalCommand_mv_download(float request, float argc)
 	{
 		case CMD_REQUEST_COMMAND:
 		{
-			Cmd_MapVote_MapDownload(argc);
-			return; 
+			if(argv(1))
+			{
+				Cmd_MapVote_MapDownload(argc);
+				return; 
+			}
 		}
 			
 		default:
+			print("Incorrect parameters for ^2mv_download^7\n");
 		case CMD_REQUEST_USAGE:
 		{
 			print("\nUsage:^3 cl_cmd mv_download mapid\n");
@@ -246,21 +250,25 @@ void LocalCommand_sendcvar(float request, float argc)
 	{
 		case CMD_REQUEST_COMMAND:
 		{
-			// W_FixWeaponOrder will trash argv, so save what we need.
-			string thiscvar = strzone(argv(1));
-			string s = cvar_string(thiscvar);
-			
-			if(thiscvar == "cl_weaponpriority")
-				s = W_FixWeaponOrder(W_NumberWeaponOrder(s), 1);
-			else if(substring(thiscvar, 0, 17) == "cl_weaponpriority" && strlen(thiscvar) == 18)
-				s = W_FixWeaponOrder(W_NumberWeaponOrder(s), 0);
+			if(argv(1))
+			{
+				// W_FixWeaponOrder will trash argv, so save what we need.
+				string thiscvar = strzone(argv(1));
+				string s = cvar_string(thiscvar);
 				
-			localcmd("cmd sentcvar ", thiscvar, " \"", s, "\"\n");
-			strunzone(thiscvar);
-			return; 
+				if(thiscvar == "cl_weaponpriority")
+					s = W_FixWeaponOrder(W_NumberWeaponOrder(s), 1);
+				else if(substring(thiscvar, 0, 17) == "cl_weaponpriority" && strlen(thiscvar) == 18)
+					s = W_FixWeaponOrder(W_NumberWeaponOrder(s), 0);
+					
+				localcmd("cmd sentcvar ", thiscvar, " \"", s, "\"\n");
+				strunzone(thiscvar);
+				return; 
+			}
 		}
 			
 		default:
+			print("Incorrect parameters for ^2sendcvar^7\n");
 		case CMD_REQUEST_USAGE:
 		{
 			print("\nUsage:^3 cl_cmd sendcvar <cvar>\n");
@@ -315,7 +323,7 @@ void LocalCommand_(float request)
 void LocalCommand_macro_help()
 {
 	#define CLIENT_COMMAND(name,function,description) \
-		{ if(strtolower(description) != string_null) { print("  ^2", name, "^7: ", description, "\n"); } }
+		{ if(strtolower(description) != "") { print("  ^2", name, "^7: ", description, "\n"); } }
 		
 	CLIENT_COMMANDS(0, 0)
 	#undef CLIENT_COMMAND
@@ -348,7 +356,7 @@ float LocalCommand_macro_usage(float argc)
 void LocalCommand_macro_write_aliases(float fh)
 {
 	#define CLIENT_COMMAND(name,function,description) \
-		{ CMD_Write_Alias("qc_cmd_cl", name, description); }
+		{ if(strtolower(description) != "") { CMD_Write_Alias("qc_cmd_cl", name, description); } }
 		
 	CLIENT_COMMANDS(0, 0)
 	#undef CLIENT_COMMAND