]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/command/cmd.qc
Prevent sentcvar from falling back to default values if no arguments are provided...
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / command / cmd.qc
index 66161af241a0bbf39c5375a9ea7a5eb4f94aef47..a8a8747e1822558f0b3c572b58a5d105b7d4c773 100644 (file)
@@ -83,8 +83,8 @@ void ClientCommand_autoswitch(entity caller, int request, int argc)
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd autoswitch selection\n");
-                       sprint(caller, "  Where 'selection' controls if autoswitch is on or off.\n");
+                       sprint(caller, "\nUsage:^3 cmd autoswitch <selection>\n");
+                       sprint(caller, "  Where <selection> controls if autoswitch is on or off.\n");
                        return;
                }
        }
@@ -126,8 +126,8 @@ void ClientCommand_clientversion(entity caller, int request, int argc)  // inter
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd clientversion version\n");
-                       sprint(caller, "  Where 'version' is the game version reported by caller.\n");
+                       sprint(caller, "\nUsage:^3 cmd clientversion <version>\n");
+                       sprint(caller, "  Where <version> is the game version reported by caller.\n");
                        return;
                }
        }
@@ -151,8 +151,8 @@ void ClientCommand_mv_getpicture(entity caller, int request, int argc)  // inter
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd mv_getpicture mapid\n");
-                       sprint(caller, "  Where 'mapid' is the id number of the map to request an image of on the map vote selection menu.\n");
+                       sprint(caller, "\nUsage:^3 cmd mv_getpicture <mapid>\n");
+                       sprint(caller, "  Where <mapid> is the id number of the map to request an image of on the map vote selection menu.\n");
                        return;
                }
        }
@@ -164,7 +164,7 @@ void ClientCommand_wpeditor(entity caller, int request, int argc)
        {
                case CMD_REQUEST_COMMAND:
                {
-                       if (!autocvar_g_waypointeditor)
+                       if (!waypointeditor_enabled)
                        {
                                sprint(caller, "ERROR: this command works only if the waypoint editor is on\n");
                                return;
@@ -241,29 +241,29 @@ void ClientCommand_wpeditor(entity caller, int request, int argc)
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd wpeditor action\n");
-                       sprint(caller, "  Where 'action' can be:\n");
-                       sprint(caller, "   ^5spawn^7: spawns a waypoint at player's position\n");
-                       sprint(caller, "   ^5remove^7: removes player's nearest waypoint\n");
-                       sprint(caller, "   ^5unreachable^7: reveals waypoints and items unreachable from the current position and spawnpoints without a nearest waypoint\n");
-                       sprint(caller, "   ^5saveall^7: saves all waypoints and links to file\n");
-                       sprint(caller, "   ^5relinkall^7: relinks all waypoints as if they were respawned\n");
-                       sprint(caller, "   ^5spawn crosshair^7: spawns a waypoint at crosshair's position\n");
+                       sprint(caller, "\nUsage:^3 cmd wpeditor <action>\n");
+                       sprint(caller, "  Where <action> can be:\n");
+                       sprint(caller, "   ^2spawn^7: spawns a waypoint at player's position\n");
+                       sprint(caller, "   ^2remove^7: removes player's nearest waypoint\n");
+                       sprint(caller, "   ^2unreachable^7: reveals waypoints and items unreachable from the current position and spawnpoints without a nearest waypoint\n");
+                       sprint(caller, "   ^2saveall^7: saves all waypoints and links to file\n");
+                       sprint(caller, "   ^2relinkall^7: relinks all waypoints as if they were respawned\n");
+                       sprint(caller, "   ^2spawn crosshair^7: spawns a waypoint at crosshair's position\n");
                        sprint(caller, "   ^7 in general useful to create special and hardwired links with ease from existing waypoints\n");
                        sprint(caller, "   ^7 in particular it's the only way to create custom jumppad waypoints (spawn another waypoint to create destination))\n");
-                       sprint(caller, "   ^5spawn jump^7: spawns a jump waypoint (place it at least 60 qu before jump start, spawn another waypoint to create destination)\n");
-                       sprint(caller, "   ^5spawn crouch^7: spawns a crouch waypoint (it links only to very close waypoints)\n");
-                       sprint(caller, "   ^5spawn support^7: spawns a support waypoint (spawn another waypoint to create destination from which all incoming links are removed)\n");
+                       sprint(caller, "   ^2spawn jump^7: spawns a jump waypoint (place it at least 60 qu before jump start, spawn another waypoint to create destination)\n");
+                       sprint(caller, "   ^2spawn crouch^7: spawns a crouch waypoint (it links only to very close waypoints)\n");
+                       sprint(caller, "   ^2spawn support^7: spawns a support waypoint (spawn another waypoint to create destination from which all incoming links are removed)\n");
                        sprint(caller, "   ^7 useful to replace links to problematic jumppad/teleport waypoints\n");
-                       sprint(caller, "   ^5hardwire^7: marks the nearest waypoint as origin of a new hardwired link (spawn another waypoint over an existing one to create destination)\n");
-                       sprint(caller, "   ^5hardwire crosshair^7: marks the waypoint at crosshair instead of the nearest waypoint\n");
-                       sprint(caller, "   ^5lock^7: locks link display of the aimed waypoint (unlocks if no waypoint is found at crosshair's position)\n");
-                       sprint(caller, "   ^5symorigin get|set\n");
-                       sprint(caller, "   ^5symorigin get|set p1 p2 ... pX\n");
-                       sprint(caller, "   ^5symaxis get|set p1 p2\n");
-                       sprint(caller, "   ^7 where p1 p2 ... pX are positions (\"x y z\", z can be omitted) that you know are perfectly symmetrical"
+                       sprint(caller, "   ^2hardwire^7: marks the nearest waypoint as origin of a new hardwired link (spawn another waypoint over an existing one to create destination)\n");
+                       sprint(caller, "   ^2hardwire crosshair^7: marks the waypoint at crosshair instead of the nearest waypoint\n");
+                       sprint(caller, "   ^2lock^7: locks link display of the aimed waypoint (unlocks if no waypoint is found at crosshair's position)\n");
+                       sprint(caller, "   ^2symorigin get|set\n");
+                       sprint(caller, "   ^2symorigin get|set <p1> <p2> ... <pX>\n");
+                       sprint(caller, "   ^2symaxis get|set <p1> <p2>\n");
+                       sprint(caller, "   ^7 where <p1> <p2> ... <pX> are positions (\"x y z\", z can be omitted) that you know are perfectly symmetrical"
                                                                " so you can determine origin/axis of symmetry of maps without ctf flags or where flags aren't perfectly symmetrical\n");
-                       sprint(caller, "  See 'wpeditor_menu' for a selectable list of various commands and useful settings to edit waypoints.\n");
+                       sprint(caller, "  See ^5wpeditor_menu^7 for a selectable list of various commands and useful settings to edit waypoints.\n");
                        return;
                }
        }
@@ -429,7 +429,7 @@ void ClientCommand_say(entity caller, int request, int argc, string command)
                case CMD_REQUEST_USAGE:
                {
                        sprint(caller, "\nUsage:^3 cmd say <message>\n");
-                       sprint(caller, "  Where 'message' is the string of text to say.\n");
+                       sprint(caller, "  Where <message> is the string of text to say.\n");
                        return;
                }
        }
@@ -450,7 +450,7 @@ void ClientCommand_say_team(entity caller, int request, int argc, string command
                case CMD_REQUEST_USAGE:
                {
                        sprint(caller, "\nUsage:^3 cmd say_team <message>\n");
-                       sprint(caller, "  Where 'message' is the string of text to say.\n");
+                       sprint(caller, "  Where <message> is the string of text to say.\n");
                        return;
                }
        }
@@ -528,9 +528,9 @@ void ClientCommand_selectteam(entity caller, int request, int argc)
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd selectteam team\n");
-                       sprint(caller, "  Where 'team' is the prefered team to try and join.\n");
-                       sprint(caller, "  Full list of options here: \"red, blue, yellow, pink, auto\"\n");
+                       sprint(caller, "\nUsage:^3 cmd selectteam <team>\n");
+                       sprint(caller, "  Where <team> is the prefered team to try and join.\n");
+                       sprint(caller, "  Full list of options here: red, blue, yellow, pink, auto.\n");
                        return;
                }
        }
@@ -554,28 +554,28 @@ void ClientCommand_selfstuff(entity caller, int request, string command)
                case CMD_REQUEST_USAGE:
                {
                        sprint(caller, "\nUsage:^3 cmd selfstuff <command>\n");
-                       sprint(caller, "  Where 'command' is the string to be stuffed to your client.\n");
+                       sprint(caller, "  Where <command> is the string to be stuffed to your client.\n");
                        return;
                }
        }
 }
 
-void ClientCommand_sentcvar(entity caller, int request, int argc, string command)
+void ClientCommand_sentcvar(entity caller, int request, int argc)
 {
        switch (request)
        {
                case CMD_REQUEST_COMMAND:
                {
-                       if (argv(1) != "")
+                       if (argc >= 3)
                        {
-                               // float tokens;
-                               string s;
-
+                       // NOTE: client-side settings do not exist on the server, this functionality has been deprecated
+                       #if 0
                                if (argc == 2)  // undefined cvar: use the default value on the server then
                                {
-                                       s = strcat(substring(command, argv_start_index(0), argv_end_index(1) - argv_start_index(0)), " \"", cvar_defstring(argv(1)), "\"");
+                                       string s = strcat(substring(command, argv_start_index(0), argv_end_index(1) - argv_start_index(0)), " \"", cvar_defstring(argv(1)), "\"");
                                        tokenize_console(s);
                                }
+                       #endif
 
                                GetCvars(caller, CS_CVAR(caller), 1);
 
@@ -587,8 +587,8 @@ void ClientCommand_sentcvar(entity caller, int request, int argc, string command
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd sentcvar <cvar>\n");
-                       sprint(caller, "  Where 'cvar' is the cvar plus arguments to send to the server.\n");
+                       sprint(caller, "\nUsage:^3 cmd sentcvar <cvar> <arguments>\n");
+                       sprint(caller, "  Where <cvar> is the cvar plus arguments to send to the server.\n");
                        return;
                }
        }
@@ -619,7 +619,7 @@ void ClientCommand_spectate(entity caller, int request)
                                                        sprint(caller, "Can't spectate ", argv(1), "^7\n");
                                        }
                                        else
-                                               sprint(caller, "cmd spectate client only works when you are spectator/observer\n");
+                                               sprint(caller, "cmd spectate <client> only works when you are spectator/observer\n");
                                        return;
                                }
 
@@ -637,8 +637,8 @@ void ClientCommand_spectate(entity caller, int request)
                default:
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd spectate [client]\n");
-                       sprint(caller, "  Where 'client' can be the player to spectate.\n");
+                       sprint(caller, "\nUsage:^3 cmd spectate [<client>]\n");
+                       sprint(caller, "  Where <client> can be the player to spectate.\n");
                        return;
                }
        }
@@ -661,8 +661,8 @@ void ClientCommand_suggestmap(entity caller, int request, int argc)
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd suggestmap map\n");
-                       sprint(caller, "  Where 'map' is the name of the map to suggest.\n");
+                       sprint(caller, "\nUsage:^3 cmd suggestmap <map>\n");
+                       sprint(caller, "  Where <map> is the name of the map to suggest.\n");
                        return;
                }
        }
@@ -718,8 +718,8 @@ void ClientCommand_tell(entity caller, int request, int argc, string command)
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd tell client <message>\n");
-                       sprint(caller, "  Where 'client' is the entity number or name of the player to send 'message' to.\n");
+                       sprint(caller, "\nUsage:^3 cmd tell <client> <message>\n");
+                       sprint(caller, "  Where <client> is the entity number or name of the player to send <message> to.\n");
                        return;
                }
        }
@@ -764,9 +764,10 @@ void ClientCommand_voice(entity caller, int request, int argc, string command)
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd voice messagetype <soundname>\n");
-                       sprint(caller, "  'messagetype' is the type of broadcast to do, like team only or such,\n");
-                       sprint(caller, "  and 'soundname' is the string/filename of the sound/voice message to play.\n");
+                       sprint(caller, "\nUsage:^3 cmd voice <voicetype> [<message>]\n");
+                       sprint(caller, "  <voicetype> is the type of voice message, it can be one of these:\n");
+                       sprint(caller, sprintf("   %s\n", allvoicesamples));
+                       sprint(caller, "  and <message> is the text message to send.\n");
                        return;
                }
        }
@@ -814,7 +815,7 @@ void ClientCommand_(entity caller, int request)
        CLIENT_COMMAND("say_team", ClientCommand_say_team(ent, request, arguments, command), "Print a message to chat to all team mates") \
        CLIENT_COMMAND("selectteam", ClientCommand_selectteam(ent, request, arguments), "Attempt to choose a team to join into") \
        CLIENT_COMMAND("selfstuff", ClientCommand_selfstuff(ent, request, command), "Stuffcmd a command to your own client") \
-       CLIENT_COMMAND("sentcvar", ClientCommand_sentcvar(ent, request, arguments, command), "New system for sending a client cvar to the server") \
+       CLIENT_COMMAND("sentcvar", ClientCommand_sentcvar(ent, request, arguments), "New system for sending a client cvar to the server") \
        CLIENT_COMMAND("spectate", ClientCommand_spectate(ent, request), "Become an observer") \
        CLIENT_COMMAND("suggestmap", ClientCommand_suggestmap(ent, request, arguments), "Suggest a map to the mapvote at match end") \
        CLIENT_COMMAND("tell", ClientCommand_tell(ent, request, arguments, command), "Send a message directly to a player") \
@@ -926,8 +927,8 @@ void SV_ParseClientCommand(entity this, string command)
                        sprint(this, "\nCommon networked commands:\n");
                        CommonCommand_macro_help(this);
 
-                       sprint(this, "\nUsage:^3 cmd COMMAND...^7, where possible commands are listed above.\n");
-                       sprint(this, "For help about a specific command, type cmd help COMMAND\n");
+                       sprint(this, "\nUsage:^3 cmd <command>^7, where possible commands are listed above.\n");
+                       sprint(this, "For help about a specific command, type cmd help <command>\n");
                        return;
                }
                else if (CommonCommand_macro_usage(argc, this))  // Instead of trying to call a command, we're going to see detailed information about it