From e9b04cf77f82c461d64c152d400e3b3ec4ac191f Mon Sep 17 00:00:00 2001
From: Samual <samual@xonotic.org>
Date: Sat, 17 Dec 2011 09:58:46 -0500
Subject: [PATCH] Lots of updates to cl_cmd.qc

---
 qcsrc/client/command/cl_cmd.qc | 32 ++++++++++++++++----------------
 qcsrc/client/command/cl_cmd.qh |  7 ++-----
 qcsrc/client/scoreboard.qc     |  2 +-
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/qcsrc/client/command/cl_cmd.qc b/qcsrc/client/command/cl_cmd.qc
index ba327793d..97896137c 100644
--- a/qcsrc/client/command/cl_cmd.qc
+++ b/qcsrc/client/command/cl_cmd.qc
@@ -199,42 +199,42 @@ void LocalCommand_hud(float request, float argc) // TODO: Add aliases in command
 					}
 				}
 				
-				case "radar":
+				case "scoreboard_columns_set":
 				{
-					if(argv(2))
-						hud_panel_radar_maximized = (stof(argv(2)) != 0);
-					else
-						hud_panel_radar_maximized = !hud_panel_radar_maximized;
+					Cmd_HUD_SetFields(argc); 
 					
 					return;
 				}
-				
-				case "scoreboard_columns_set":
+
+				case "scoreboard_columns_help":
 				{
-					Cmd_HUD_SetFields(argc); // todo update this function
+					Cmd_HUD_Help();
 					
 					return;
 				}
-
-				case "scoreboard_columns_help":
+				
+				case "radar":
 				{
-					Cmd_HUD_Help(argc); // todo update this function
+					if(argv(2))
+						hud_panel_radar_maximized = (stof(argv(2)) != 0);
+					else
+						hud_panel_radar_maximized = !hud_panel_radar_maximized;
 					
 					return;
 				}
 			}
-			return; 
 		}
 			
 		default:
 			print("Incorrect parameters for ^2hud^7\n");
 		case CMD_REQUEST_USAGE:
 		{
-			print("\nUsage:^3 cl_cmd hud action [configname | radartoggle]\n");
+			print("\nUsage:^3 cl_cmd hud action [configname | radartoggle | layout]\n");
 			print("  Where 'action' is the command to complete,\n");
 			print("  'configname' is the name to save to for \"save\" action,\n");
-			print("  and 'radartoggle' is to control hud_panel_radar_maximized for \"radar\" action.\n");
-			print("  Full list of commands here: \"configure, save, radar.\"\n");
+			print("  'radartoggle' is to control hud_panel_radar_maximized for \"radar\" action,\n");
+			print("  and 'layout' is how to organize the scoreboard columns for the set action.\n");
+			print("  Full list of commands here: \"configure, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n");
 			return;
 		}
 	}
@@ -254,7 +254,7 @@ void LocalCommand_mv_download(float request, float argc)
 		default:
 		case CMD_REQUEST_USAGE:
 		{
-			print("\nUsage:^3 cl_cmd mapvote_download mapid\n");
+			print("\nUsage:^3 cl_cmd mv_download mapid\n");
 			print("  Where 'mapid' is the id number of the map to request an image of on the map vote selection menu.\n");
 			return;
 		}
diff --git a/qcsrc/client/command/cl_cmd.qh b/qcsrc/client/command/cl_cmd.qh
index 17238b94a..6e562af92 100644
--- a/qcsrc/client/command/cl_cmd.qh
+++ b/qcsrc/client/command/cl_cmd.qh
@@ -1,10 +1,7 @@
 // ==============================================
 //  CSQC client commands code, written by Samual
-//  Last updated: November 26th, 2011
+//  Last updated: December 17th, 2011
 // ==============================================
 
 void Cmd_HUD_SetFields(float);
-void Cmd_HUD_Help(float);
-
-.vector view_ofs;
-entity debug_shotorg;
\ No newline at end of file
+void Cmd_HUD_Help();
\ No newline at end of file
diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index 7d452713b..f560bb12f 100644
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -234,7 +234,7 @@ void HUD_UpdateTeamPos(entity Team)
 	}
 }
 
-void Cmd_HUD_Help(float argc)
+void Cmd_HUD_Help()
 {
 	print(_("You can modify the scoreboard using the ^2scoreboard_columns_set command.\n"));
 	print(_("^3|---------------------------------------------------------------|\n"));
-- 
2.39.2