// =========================================================
// Server side networked commands code, reworked by Samual
-// Last updated: December 13th, 2011
+// Last updated: December 26th, 2011
// =========================================================
-// declarations in cmd.qh
-
-// move any necessary sprint statements to "print_to"
-
float SV_ParseClientCommand_floodcheck()
{
- if (timeoutStatus != 2) // if the game is not paused... but wait, doesn't that mean it could be dos'd by pausing it? eh? (old code)
+ if not(timeout_status) // not while paused
{
if(time <= (self.cmd_floodtime + autocvar_sv_clientcommand_antispam_time))
{
{
case CMD_REQUEST_COMMAND:
{
- self.autoswitch = ("0" != argv(1));
+ self.autoswitch = InterpretBoolean(argv(1));
sprint(self, strcat("^1autoswitch is currently turned ", (self.autoswitch ? "on" : "off"), ".\n"));
return; // never fall through to usage
}
case CMD_REQUEST_USAGE:
{
sprint(self, "\nUsage:^3 cmd autoswitch selection\n");
- sprint(self, " Where 'selection' is 1 or 0 for on or off.\n");
+ sprint(self, " Where 'selection' controls if autoswitch is on or off.\n");
return;
}
}
}
-void ClientCommand_checkfail(float request, string command) // used only by client side code
+void ClientCommand_checkfail(float request, string command) // internal command, used only by code
{
switch(request)
{
default:
case CMD_REQUEST_USAGE:
{
- sprint(self, "\nUsage:^3 cmd checkfail message\n");
+ sprint(self, "\nUsage:^3 cmd checkfail <message>\n");
sprint(self, " Where 'message' is the message reported by client about the fail.\n");
return;
}
}
}
-void ClientCommand_clientversion(float request, float argc) // used only by client side code
+void ClientCommand_clientversion(float request, float argc) // internal command, used only by code
{
switch(request)
{
}
}
-void ClientCommand_getmapvotepic(float request, float argc)
+void ClientCommand_getmapvotepic(float request, float argc) // internal command, used only by code
{
switch(request)
{
}
}
-void ClientCommand_join(float request)
+void ClientCommand_join(float request) // legacy
{
switch(request)
{
}
}
-void ClientCommand_ready(float request)
+void ClientCommand_ready(float request) // todo: anti-spam for toggling readyness
{
switch(request)
{
}
// cannot reset the game while a timeout is active!
- if(!timeoutStatus)
+ if not(timeout_status)
ReadyCount();
} else {
sprint(self, "^1Game has already been restarted\n");
}
}
-void ClientCommand_reportcvar(float request, float argc, string command) // TODO: confirm this works
+void ClientCommand_reportcvar(float request, float argc, string command)
{
switch(request)
{
}
}
-void ClientCommand_selectteam(float request, float argc) // TODO: Update the messages for this command
+void ClientCommand_selectteam(float request, float argc)
{
switch(request)
{
default:
case CMD_REQUEST_USAGE:
{
- sprint(self, "\nUsage:^3 cmd selfstuff command\n");
+ sprint(self, "\nUsage:^3 cmd selfstuff <command>\n");
sprint(self, " Where 'command' is the string to be stuffed to your client.\n");
return;
}
}
}
-void ClientCommand_spectate(float request)
+void ClientCommand_spectate(float request) // legacy
{
switch(request)
{
{
case CMD_REQUEST_COMMAND:
{
- entity e = GetCommandPlayerSlotTargetFromTokenizedCommand(argc, 1);
-
- if(e && argc > ParseCommandPlayerSlotTarget_firsttoken)
- {
- Say(self, FALSE, e, substring(command, argv_start_index(ParseCommandPlayerSlotTarget_firsttoken), argv_end_index(-1) - argv_start_index(ParseCommandPlayerSlotTarget_firsttoken)), TRUE);
- }
- else
+ if(argc >= 3)
{
- if(argc > ParseCommandPlayerSlotTarget_firsttoken)
+ entity tell_to = GetFilteredEntity(argv(1));
+ float tell_accepted = VerifyClientEntity(tell_to, TRUE, FALSE);
+
+ if(tell_accepted > 0) // the target is a real client
+ {
+ if(tell_to != self) // and we're allowed to send to them :D
+ {
+ Say(self, FALSE, tell_to, substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2)), TRUE);
+ return;
+ }
+ else { print_to(self, "You can't ^2tell^7 a message to yourself."); return; }
+ }
+ else if(strtolower(argv(1)) == "world")
+ {
trigger_magicear_processmessage_forallears(self, -1, world, substring(command, argv_start_index(ParseCommandPlayerSlotTarget_firsttoken), argv_end_index(-1) - argv_start_index(ParseCommandPlayerSlotTarget_firsttoken)));
+ return;
+ }
+ else { print_to(self, strcat("tell: ", GetClientErrorString(tell_accepted, argv(1)), ".")); return; }
}
- return; // never fall through to usage
}
default:
+ sprint(self, "Incorrect parameters for ^2tell^7\n");
case CMD_REQUEST_USAGE:
{
- sprint(self, "\nUsage:^3 cmd tell playerid <message>\n");
- sprint(self, " Where 'playerid' is the entity number of the player to send the 'message' to.\n");
+ sprint(self, "\nUsage:^3 cmd tell client <message>\n");
+ sprint(self, " Where 'client' is the entity number or name of the player to send 'message' to.\n");
return;
}
}
}
-void ClientCommand_voice(float request, float argc, string command)
+void ClientCommand_voice(float request, float argc, string command) // legacy
{
switch(request)
{
default:
case CMD_REQUEST_USAGE:
{
- sprint(self, "\nUsage:^3 cmd voice\n");
- sprint(self, " FIXME ARGUMENTS UNKNOWN.\n");
+ sprint(self, "\nUsage:^3 cmd voice messagetype <soundname>\n");
+ sprint(self, " 'messagetype' is the type of broadcast to do, like team only or such,\n");
+ sprint(self, " and 'soundname' is the string/filename of the sound/voice message to play.\n");
return;
}
}
}
-/* use this when creating a new command, making sure to place it in alphabetical order.
+/* use this when creating a new command, making sure to place it in alphabetical order... also,
+** ADD ALL NEW COMMANDS TO commands.cfg WITH PROPER ALIASES IN THE SAME FASHION!
void ClientCommand_(float request)
{
switch(request)
// =====================================
// Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
+// Common commands have double indentation to separate them a bit.
#define CLIENT_COMMANDS(request,arguments,command) \
CLIENT_COMMAND("autoswitch", ClientCommand_autoswitch(request, arguments), "Whether or not to switch automatically when getting a better weapon") \
CLIENT_COMMAND("checkfail", ClientCommand_checkfail(request, command), "Report if a client-side check failed") \
CLIENT_COMMAND("clientversion", ClientCommand_clientversion(request, arguments), "Release version of the game") \
- CLIENT_COMMAND("cvar_changes", CommonCommand_cvar_changes(request), "Prints a list of all changed server cvars") \
- CLIENT_COMMAND("cvar_purechanges", CommonCommand_cvar_purechanges(request), "Prints a list of all changed gameplay cvars") \
+ CLIENT_COMMAND("cvar_changes", CommonCommand_cvar_changes(request, self), "Prints a list of all changed server cvars") \
+ CLIENT_COMMAND("cvar_purechanges", CommonCommand_cvar_purechanges(request, self), "Prints a list of all changed gameplay cvars") \
CLIENT_COMMAND("getmapvotepic", ClientCommand_getmapvotepic(request, arguments), "Retrieve mapshot picture from the server") \
- CLIENT_COMMAND("info", CommonCommand_info(request, arguments), "Request for unique server information set up by admin") \
+ CLIENT_COMMAND("info", CommonCommand_info(request, self, arguments), "Request for unique server information set up by admin") \
CLIENT_COMMAND("join", ClientCommand_join(request), "Become a player in the game") \
- CLIENT_COMMAND("ladder", CommonCommand_ladder(request), "Get information about top players if supported") \
- CLIENT_COMMAND("lsmaps", CommonCommand_lsmaps(request), "List maps which can be used with the current game mode") \
- CLIENT_COMMAND("lsnewmaps", CommonCommand_lsnewmaps(request), "List maps which TODO") \
- CLIENT_COMMAND("maplist", CommonCommand_maplist(request), "Full server maplist reply") \
- CLIENT_COMMAND("rankings", CommonCommand_rankings(request), "Print information about rankings") \
+ CLIENT_COMMAND("ladder", CommonCommand_ladder(request, self), "Get information about top players if supported") \
+ CLIENT_COMMAND("lsmaps", CommonCommand_lsmaps(request, self), "List maps which can be used with the current game mode") \
+ CLIENT_COMMAND("lsnewmaps", CommonCommand_lsnewmaps(request, self), "List maps which have no records or are seemingly unplayed yet") \
+ CLIENT_COMMAND("maplist", CommonCommand_maplist(request, self), "Display full server maplist reply") \
+ CLIENT_COMMAND("rankings", CommonCommand_rankings(request, self), "Print information about rankings") \
CLIENT_COMMAND("ready", ClientCommand_ready(request), "Qualify as ready to end warmup stage (or restart server if allowed)") \
- CLIENT_COMMAND("records", CommonCommand_records(request), "List top 10 records for the current map") \
+ CLIENT_COMMAND("records", CommonCommand_records(request, self), "List top 10 records for the current map") \
CLIENT_COMMAND("reportcvar", ClientCommand_reportcvar(request, arguments, command), "Old system for sending a client cvar to the server") \
CLIENT_COMMAND("say", ClientCommand_say(request, arguments, command), "Print a message to chat to all players") \
CLIENT_COMMAND("say_team", ClientCommand_say_team(request, arguments, command), "Print a message to chat to all team mates") \
CLIENT_COMMAND("sentcvar", ClientCommand_sentcvar(request, arguments, command), "New system for sending a client cvar to the server") \
CLIENT_COMMAND("spectate", ClientCommand_spectate(request), "Become an observer") \
CLIENT_COMMAND("suggestmap", ClientCommand_suggestmap(request, arguments), "Suggest a map to the mapvote at match end") \
- CLIENT_COMMAND("teamstatus", CommonCommand_teamstatus(request), "Print detailed score information for all players") \
+ CLIENT_COMMAND("teamstatus", CommonCommand_teamstatus(request, self), "Show information about player and team scores") \
CLIENT_COMMAND("tell", ClientCommand_tell(request, arguments, command), "Send a message directly to a player") \
- CLIENT_COMMAND("timein", CommonCommand_timein(request), "Resume the game from being paused with a timeout") \
- CLIENT_COMMAND("timeout", CommonCommand_timeout(request), "Call a timeout which pauses the game for certain amount of time unless unpaused") \
+ CLIENT_COMMAND("time", CommonCommand_time(request, self), "Print different formats/readouts of time") \
+ CLIENT_COMMAND("timein", CommonCommand_timein(request, self), "Resume the game from being paused with a timeout") \
+ CLIENT_COMMAND("timeout", CommonCommand_timeout(request, self), "Call a timeout which pauses the game for certain amount of time unless unpaused") \
CLIENT_COMMAND("voice", ClientCommand_voice(request, arguments, command), "Send voice message via sound") \
- CLIENT_COMMAND("vote", VoteCommand(request, self, arguments, command), "Request an action to be voted upon by players") \
- CLIENT_COMMAND("who", CommonCommand_who(request), "Display detailed client information about all players") \
+ CLIENT_COMMAND("vote", VoteCommand(request, self, arguments, command), "Request an action to be voted upon by players") \
+ CLIENT_COMMAND("who", CommonCommand_who(request, self, arguments), "Display detailed client information about all players") \
/* nothing */
void ClientCommand_macro_help()
{
float argc = tokenize_console(command);
+ // Guide for working with argc arguments by example:
+ // argc: 1 - 2 - 3 - 4
+ // argv: 0 - 1 - 2 - 3
+ // cmd vote - master - login - password
+
// for floodcheck
switch(strtolower(argv(0)))
{
// exempt commands which are not subject to floodcheck
case "begin": break; // handled by engine in host_cmd.c
+ case "download": break; // handled by engine in cl_parse.c
case "getmapvotepic": break; // handled by server in this file
case "pause": break; // handled by engine in host_cmd.c
case "prespawn": break; // handled by engine in host_cmd.c
if(SV_ParseClientCommand_floodcheck())
break; // "TRUE": continue, as we're not flooding yet
else
- return; // "FALSE": not allowed to continue, halt
+ return print("^1ERROR: ^7ANTISPAM CAUGHT: ", command, ".\n"); // "FALSE": not allowed to continue, halt
}
- /* NOTE: totally disabled for now, however the functionality and descriptions are there if we ever want it.
+ /* NOTE: totally disabled for now for bandwidth/security reasons, however the functionality and descriptions are there if we ever want it.
if(argv(0) == "help")
{
if(argc == 1)
}
else if(ClientCommand_macro_command(argc, command)) // continue as usual and scan for normal commands
{
- return; // handled by one of the above GameCommand_* functions
+ return; // handled by one of the above ClientCommand_* functions
}
else
clientcommand(self, command);