From 17978a030a0bd39cb5e07d478c74fd55d0ee24fc Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Sat, 10 Jan 2015 18:10:05 -0800
Subject: [PATCH] more command help

---
 arch/sdl/key.c | 15 ++++++++++++++-
 main/cmd.c     |  8 ++++----
 main/concntl.c |  5 ++++-
 main/cvar.c    |  5 ++++-
 main/game.c    | 27 ++++++++++++++++++++++++---
 5 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/arch/sdl/key.c b/arch/sdl/key.c
index 4c35b40e..60650486 100644
--- a/arch/sdl/key.c
+++ b/arch/sdl/key.c
@@ -376,6 +376,16 @@ void key_cmd_bind(int argc, char **argv)
 	int key = -1;
 	int i;
 
+	if (argc == 2 && !stricmp(argv[1], "-h")) {
+		con_printf(CON_NORMAL, "%s <key> <commands>\n", argv[0]);
+		con_printf(CON_NORMAL, "    bind <commands> to <key>\n");
+		con_printf(CON_NORMAL, "%s <key>\n", argv[0]);
+		con_printf(CON_NORMAL, "    show the current binding for <key>\n");
+		con_printf(CON_NORMAL, "%s\n", argv[0]);
+		con_printf(CON_NORMAL, "    show all key bindings\n");
+		return;
+	}
+
 	if (argc < 2)
 	{
 		con_printf(CON_NORMAL, "key bindings:\n");
@@ -424,8 +434,11 @@ void key_cmd_unbind(int argc, char **argv)
 {
 	unsigned int key;
 
-	if (argc < 2)
+	if (argc != 2 || !stricmp(argv[1], "-h")) {
+		con_printf(CON_NORMAL, "%s <key>\n", argv[0]);
+		con_printf(CON_NORMAL, "    remove binding from <key>\n");
 		return;
+	}
 
 	for (key = 0; key < 256; key++) {
 		if (!stricmp(argv[1], key_text[key])) {
diff --git a/main/cmd.c b/main/cmd.c
index 7d9c3f80..7203e172 100644
--- a/main/cmd.c
+++ b/main/cmd.c
@@ -307,9 +307,9 @@ void cmd_alias(int argc, char **argv)
 	int i;
 
 	if (argc == 2 && !stricmp(argv[1], "-h")) {
-		con_printf(CON_NORMAL, "%s [name] [commands]\n", argv[0]);
+		con_printf(CON_NORMAL, "%s <name> <commands>\n", argv[0]);
 		con_printf(CON_NORMAL, "    define <name> as an alias for <commands>\n");
-		con_printf(CON_NORMAL, "%s [name]\n", argv[0]);
+		con_printf(CON_NORMAL, "%s <name>\n", argv[0]);
 		con_printf(CON_NORMAL, "    show the current definition of <name>\n");
 		con_printf(CON_NORMAL, "%s\n", argv[0]);
 		con_printf(CON_NORMAL, "    show all defined aliases\n");
@@ -462,8 +462,8 @@ void cmd_help(int argc, char **argv)
 	cmd_t *cmd;
 
 	if (argc > 2 || (argc == 2 && !stricmp(argv[1], "-h"))) {
-		con_printf(CON_NORMAL, "usage: %s [cmd]\n", argv[0]);
-		con_printf(CON_NORMAL, "    get help for <cmd>, or list all commands if not specified.\n");
+		con_printf(CON_NORMAL, "usage: %s [command]\n", argv[0]);
+		con_printf(CON_NORMAL, "    get help for <command>, or list all commands if not specified.\n");
 
 		return;
 	}
diff --git a/main/concntl.c b/main/concntl.c
index b8ed0212..1305bef6 100644
--- a/main/concntl.c
+++ b/main/concntl.c
@@ -83,8 +83,11 @@ void concntl_cmd_weapon(int argc, char **argv)
 {
 	int n;
 
-	if (argc < 2)
+	if (argc < 2 || !stricmp(argv[1], "-h")) {
+		con_printf(CON_NORMAL, "%s <num>\n", argv[0]);
+		con_printf(CON_NORMAL, "    select or toggle weapon <num>\n");
 		return;
+	}
 
 	n = atoi(argv[1]);
 	if (n == 0)
diff --git a/main/cvar.c b/main/cvar.c
index cf621d7b..8b9e65ea 100644
--- a/main/cvar.c
+++ b/main/cvar.c
@@ -37,8 +37,11 @@ void cvar_cmd_set(int argc, char **argv)
 	char buf[CVAR_MAX_LENGTH];
 	int ret, i;
 
-	if (argc < 3)
+	if (argc < 3 || !stricmp(argv[1], "-h")) {
+		con_printf(CON_NORMAL, "%s <name> <value>\n", argv[0]);
+		con_printf(CON_NORMAL, "    set variable <name> equal to <value>\n");
 		return;
+	}
 
 	ret = snprintf(buf, CVAR_MAX_LENGTH, "%s", argv[2]);
 	if (ret >= CVAR_MAX_LENGTH) {
diff --git a/main/game.c b/main/game.c
index e3a8c8c3..98e1e1df 100644
--- a/main/game.c
+++ b/main/game.c
@@ -286,8 +286,11 @@ void load_background_bitmap()
 /* load player */
 void game_cmd_player(int argc, char **argv)
 {
-	if (argc < 2)
+	if (argc < 2 || !stricmp(argv[1], "-h")) {
+		con_printf(CON_NORMAL, "%s <name>\n", argv[0]);
+		con_printf(CON_NORMAL, "    use the player/pilot file <name>\n");
 		return;
+	}
 
 	strncpy(Players[Player_num].callsign, argv[1], CALLSIGN_LEN);
 
@@ -305,8 +308,11 @@ void game_cmd_map(int argc, char **argv)
 {
 	int level_num = 1;
 
-	if (argc < 2)
+	if (argc < 2 || !stricmp(argv[1], "-h")) {
+		con_printf(CON_NORMAL, "%s <name> [num]\n", argv[0]);
+		con_printf(CON_NORMAL, "    start level <num> of mission <name> (defaults to level 1)\n");
 		return;
+	}
 
 	if (!strlen(Players[Player_num].callsign)) {
 		con_printf(CON_CRITICAL, "map: no player selected, not starting level\n");
@@ -334,8 +340,11 @@ void game_cmd_say(int argc, char **argv)
 {
 	int ret, i;
 
-	if (argc < 2)
+	if (argc < 2 || !stricmp(argv[1], "-h")) {
+		con_printf(CON_NORMAL, "%s <text>\n", argv[0]);
+		con_printf(CON_NORMAL, "    send the message <text> to the network\n");
 		return;
+	}
 
 	Network_message[0] = 0;
 
@@ -360,6 +369,12 @@ void game_cmd_say(int argc, char **argv)
 /* increase window size */
 void game_cmd_sizeup(int argc, char **argv)
 {
+	if (argc > 1) {
+		con_printf(CON_NORMAL, "%s\n", argv[0]);
+		con_printf(CON_NORMAL, "    increase the game window size\n");
+		return;
+	}
+
 	grow_window();
 }
 
@@ -367,6 +382,12 @@ void game_cmd_sizeup(int argc, char **argv)
 /* decrease window size */
 void game_cmd_sizedown(int argc, char **argv)
 {
+	if (argc > 1) {
+		con_printf(CON_NORMAL, "%s\n", argv[0]);
+		con_printf(CON_NORMAL, "    decrease the game window size\n");
+		return;
+	}
+
 	shrink_window();
 }
 
-- 
2.39.2