X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fcmd.qc;h=0eae7e0e67ad8a5537dfb81b3bdea554dcc84aff;hb=f25c6de690327ed606161da945ed436cca12886e;hp=362847554220cbdf6a095916475f9884f4d6499e;hpb=67855fef6d7c7295e5c87864bc3e28b616a6014f;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 362847554..0eae7e0e6 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -40,51 +40,60 @@ // Last updated: December 28th, 2011 // ========================================================= -bool SV_ParseClientCommand_floodcheck(entity this) -{ - entity store = IS_CLIENT(this) ? CS(this) : this; // unfortunately, we need to store these on the client initially - if (!timeout_status) // not while paused +// ======================= +// Command Sub-Functions +// ======================= + +void ClientCommand_autoswitch(entity caller, int request, int argc) +{ + switch (request) { - if (time <= (store.cmd_floodtime + autocvar_sv_clientcommand_antispam_time)) + case CMD_REQUEST_COMMAND: { - store.cmd_floodcount += 1; - if (store.cmd_floodcount > autocvar_sv_clientcommand_antispam_count) return false; // too much spam, halt + if (argv(1) != "") + { + CS_CVAR(caller).cvar_cl_autoswitch = InterpretBoolean(argv(1)); + sprint(caller, strcat("^1autoswitch is currently turned ", (CS_CVAR(caller).cvar_cl_autoswitch ? "on" : "off"), ".\n")); + return; + } } - else + + default: + sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0))); + case CMD_REQUEST_USAGE: { - store.cmd_floodtime = time; - store.cmd_floodcount = 1; + sprint(caller, "\nUsage:^3 cmd autoswitch \n"); + sprint(caller, " Where controls if autoswitch is on or off.\n"); + return; } } - return true; // continue, as we're not flooding yet } - -// ======================= -// Command Sub-Functions -// ======================= - -void ClientCommand_autoswitch(entity caller, int request, int argc) +void ClientCommand_clear_ignores(entity caller, int request) { switch (request) { case CMD_REQUEST_COMMAND: { - if (argv(1) != "") + bool advanced = (caller.crypto_idfp && caller.crypto_idfp != ""); + + if(!advanced) { - CS_CVAR(caller).autoswitch = InterpretBoolean(argv(1)); - sprint(caller, strcat("^1autoswitch is currently turned ", (CS_CVAR(caller).autoswitch ? "on" : "off"), ".\n")); + sprint(caller, "You don't have a stats UID, unable to clear your ignore list.\n"); return; } + + ignore_clearall(caller); + sprint(caller, "All permanent ignores cleared!\n"); + return; } default: - 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 clear_ignores\n"); + sprint(caller, " Removes all existing ignored clients whose are kept out of personal chat log.\n"); return; } } @@ -114,7 +123,7 @@ void ClientCommand_clientversion(entity caller, int request, int argc) // inter else if (teamplay && !autocvar_sv_spectate && !(Player_GetForcedTeamIndex(caller) > 0)) { TRANSMUTE(Observer, caller); // really? - stuffcmd(caller, "menu_showteamselect\n"); + stuffcmd(caller, "scoreboard_team_selection\n"); } } @@ -126,8 +135,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 \n"); + sprint(caller, " Where is the game version reported by caller.\n"); return; } } @@ -151,8 +160,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 \n"); + sprint(caller, " Where is the id number of the map to request an image of on the map vote selection menu.\n"); return; } } @@ -164,7 +173,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 +250,101 @@ 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 \n"); + sprint(caller, " Where 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 ... \n"); + sprint(caller, " ^2symaxis get|set \n"); + sprint(caller, " ^7 where ... 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; + } + } +} + +void ClientCommand_ignore(entity caller, int request, int argc, string command) +{ + switch (request) + { + case CMD_REQUEST_COMMAND: + { + if (argc >= 2) + { + bool advanced = (caller.crypto_idfp && caller.crypto_idfp != ""); + + if(!argv(1) || argv(1) == "") + { + sprint(caller, "This command requires an argument. Use a player's name or their ID from the ^2status^7 command.\n"); + return; + } + + entity ignore_to = GetIndexedEntity(argc, 1); + float ignore_accepted = VerifyClientEntity(ignore_to, true, false); + + if (ignore_accepted > 0 && IS_REAL_CLIENT(ignore_to)) // the target is a real client + { + if (ignore_to != caller) // and we're allowed to ignore them heh + { + if(ignore_playerinlist(ignore_to, caller)) + { + sprint(caller, ignore_to.netname, " ^7is already ignored!\n"); + return; + } + + // advanced ignore mode, works if both the player and the sender have a stats UID + if(advanced && ignore_to.crypto_idfp && ignore_to.crypto_idfp != "") + { + for(int j = 0; j < IGNORE_MAXPLAYERS; ++j) + { + string pos = db_get(ServerProgsDB, strcat("/ignore/", caller.crypto_idfp, "/", ftos(j))); + if(pos == "") + { + db_put(ServerProgsDB, strcat("/ignore/", caller.crypto_idfp, "/", ftos(j)), ignore_to.crypto_idfp); + sprint(caller, "You will no longer receive messages from ", ignore_to.netname, "^7, use ^2unignore^7 to hear them again.\n"); + return; + } + } + + sprint(caller, "You may only ignore up to ", ftos(IGNORE_MAXPLAYERS), " players, remove one before trying again.\n"); + return; + } + + if(caller.ignore_list) + strunzone(caller.ignore_list); + caller.ignore_list = strzone(cons(caller.ignore_list, ftos(etof(ignore_to)))); + + sprint(caller, "You no longer receive messages from ", ignore_to.netname, "^7, use ^2unignore^7 to hear them again.\n"); + } + else { sprint(caller, "You can't ^2ignore^7 yourself.\n"); } + } + else { print_to(caller, strcat("ignore: ", GetClientErrorString(ignore_accepted, argv(1)), ".\nUnable to ignore this player, check their ID.")); } + + return; + } + } + + default: + sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0))); + case CMD_REQUEST_USAGE: + { + sprint(caller, "\nUsage:^3 cmd ignore \n"); + sprint(caller, " Where is the entity number or name of the player to ignore keeping out of personal chat log.\n"); return; } } @@ -282,6 +363,7 @@ void ClientCommand_join(entity caller, int request) else if(time < CS(caller).jointime + MIN_SPEC_TIME) CS(caller).autojoin_checked = -1; } + CS(caller).parm_idlesince = time; return; // never fall through to usage } @@ -366,41 +448,26 @@ void ClientCommand_physics(entity caller, int request, int argc) } } -void ClientCommand_ready(entity caller, int request) // todo: anti-spam for toggling readyness +void ClientCommand_ready(entity caller, int request) { switch (request) { case CMD_REQUEST_COMMAND: { - if (IS_CLIENT(caller)) + if (warmup_stage || g_race_qualifying == 2) + if (IS_PLAYER(caller) || INGAME_JOINED(caller)) { - if (warmup_stage || autocvar_sv_ready_restart || g_race_qualifying == 2) + if (caller.ready) // toggle { - if (!readyrestart_happened || autocvar_sv_ready_restart_repeatable) - { - if (time < game_starttime) // game is already restarting - return; - if (caller.ready) // toggle - { - caller.ready = false; - if(IS_PLAYER(caller) || caller.caplayer == 1) - bprint(playername(caller.netname, caller.team, false), "^2 is ^1NOT^2 ready\n"); - } - else - { - caller.ready = true; - if(IS_PLAYER(caller) || caller.caplayer == 1) - bprint(playername(caller.netname, caller.team, false), "^2 is ready\n"); - } - - // cannot reset the game while a timeout is active! - if (!timeout_status) ReadyCount(); - } - else - { - sprint(caller, "^1Game has already been restarted\n"); - } + caller.ready = false; + bprint(playername(caller.netname, caller.team, false), "^2 is ^1NOT^2 ready\n"); } + else + { + caller.ready = true; + bprint(playername(caller.netname, caller.team, false), "^2 is ready\n"); + } + ReadyCount(); } return; // never fall through to usage } @@ -429,7 +496,7 @@ void ClientCommand_say(entity caller, int request, int argc, string command) case CMD_REQUEST_USAGE: { sprint(caller, "\nUsage:^3 cmd say \n"); - sprint(caller, " Where 'message' is the string of text to say.\n"); + sprint(caller, " Where is the string of text to say.\n"); return; } } @@ -450,7 +517,7 @@ void ClientCommand_say_team(entity caller, int request, int argc, string command case CMD_REQUEST_USAGE: { sprint(caller, "\nUsage:^3 cmd say_team \n"); - sprint(caller, " Where 'message' is the string of text to say.\n"); + sprint(caller, " Where is the string of text to say.\n"); return; } } @@ -528,9 +595,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 \n"); + sprint(caller, " Where 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 +621,28 @@ void ClientCommand_selfstuff(entity caller, int request, string command) case CMD_REQUEST_USAGE: { sprint(caller, "\nUsage:^3 cmd selfstuff \n"); - sprint(caller, " Where 'command' is the string to be stuffed to your client.\n"); + sprint(caller, " Where 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 +654,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 \n"); - sprint(caller, " Where 'cvar' is the cvar plus arguments to send to the server.\n"); + sprint(caller, "\nUsage:^3 cmd sentcvar \n"); + sprint(caller, " Where is the cvar plus arguments to send to the server.\n"); return; } } @@ -607,7 +674,7 @@ void ClientCommand_spectate(entity caller, int request) if(IS_SPEC(caller) || IS_OBSERVER(caller)) { entity client = GetFilteredEntity(argv(1)); - int spec_accepted = VerifyClientEntity(client, false, false); + float spec_accepted = VerifyClientEntity(client, false, false); if(spec_accepted > 0 && IS_PLAYER(client)) { bool caller_is_observer = (IS_OBSERVER(caller)); @@ -619,7 +686,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 only works when you are spectator/observer\n"); return; } @@ -637,8 +704,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 []\n"); + sprint(caller, " Where can be the player to spectate.\n"); return; } } @@ -661,8 +728,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 \n"); + sprint(caller, " Where is the name of the map to suggest.\n"); return; } } @@ -718,8 +785,62 @@ 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 \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 \n"); + sprint(caller, " Where is the entity number or name of the player to send to.\n"); + return; + } + } +} + +void ClientCommand_unignore(entity caller, int request, int argc, string command) +{ + switch (request) + { + case CMD_REQUEST_COMMAND: + { + if (argc >= 2) + { + bool advanced = (caller.crypto_idfp && caller.crypto_idfp != ""); + + if(!argv(1) || argv(1) == "") + { + sprint(caller, "This command requires an argument. Use a player's name or their ID from the ^2status^7 command.\n"); + return; + } + + entity unignore_to = GetIndexedEntity(argc, 1); + float unignore_accepted = VerifyClientEntity(unignore_to, true, false); + + if (unignore_accepted > 0 && IS_REAL_CLIENT(unignore_to)) // the target is a real client + { + if (unignore_to != caller) + { + string mylist = ignore_removefromlist(caller, unignore_to); + if(!advanced) + { + if(caller.ignore_list) + strunzone(caller.ignore_list); + + caller.ignore_list = strzone(mylist); + } + + sprint(caller, "You can now receive messages from ", unignore_to.netname, " ^7again.\n"); + return; + } + else { sprint(caller, "You can't ^2unignore^7 yourself.\n"); } + } + else { print_to(caller, strcat("unignore: ", GetClientErrorString(unignore_accepted, argv(1)), ".\nUnable to stop ignoring this player, check their ID.")); } + + return; + } + } + + default: + sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0))); + case CMD_REQUEST_USAGE: + { + sprint(caller, "\nUsage:^3 cmd unignore \n"); + sprint(caller, " Where is the entity number or name of the player to stop ignoring when is keeping out of personal chat log.\n"); return; } } @@ -764,9 +885,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 \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 []\n"); + sprint(caller, " is the type of voice message, it can be one of these:\n"); + sprint(caller, sprintf(" %s\n", allvoicesamples)); + sprint(caller, " and is the text message to send.\n"); return; } } @@ -803,7 +925,9 @@ void ClientCommand_(entity caller, int request) // Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;) #define CLIENT_COMMANDS(ent, request, arguments, command) \ CLIENT_COMMAND("autoswitch", ClientCommand_autoswitch(ent, request, arguments), "Whether or not to switch automatically when getting a better weapon") \ + CLIENT_COMMAND("clear_ignores", ClientCommand_clear_ignores(ent, request), "Remove all existing ignored clients") \ CLIENT_COMMAND("clientversion", ClientCommand_clientversion(ent, request, arguments), "Release version of the game") \ + CLIENT_COMMAND("ignore", ClientCommand_ignore(ent, request, arguments, command), "Ignore a client in the game keeping out of personal chat log for a match") \ CLIENT_COMMAND("join", ClientCommand_join(ent, request), "Become a player in the game") \ CLIENT_COMMAND("kill", ClientCommand_kill(ent, request), "Become a member of the dead") \ CLIENT_COMMAND("minigame", ClientCommand_minigame(ent, request, arguments, command), "Start a minigame") \ @@ -814,11 +938,12 @@ 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") \ CLIENT_COMMAND("voice", ClientCommand_voice(ent, request, arguments, command), "Send voice message via sound") \ + CLIENT_COMMAND("unignore", ClientCommand_unignore(ent, request, arguments, command), "Remove an existing ignored player") \ CLIENT_COMMAND("wpeditor", ClientCommand_wpeditor(ent, request, arguments), "Waypoint editor commands") \ /* nothing */ @@ -899,12 +1024,36 @@ void SV_ParseClientCommand(entity this, string command) case "prespawn": break; // handled by engine in host_cmd.c case "sentcvar": break; // handled by server in this file case "spawn": break; // handled by engine in host_cmd.c - case "color": case "topcolor": case "bottomcolor": if(teamplay) return; else break; // handled by engine in host_cmd.c + case "say": case "say_team": case "tell": break; // chat has its own flood control in chat.qc + case "color": case "topcolor": case "bottomcolor": // handled by engine in host_cmd.c + if(!IS_CLIENT(this)) // on connection + { + // since gamecode doesn't have any calls earlier than this, do the connecting message here + Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_CONNECTING, this.netname); + } + if(teamplay) + return; + break; case "c2s": Net_ClientCommand(this, command); return; // handled by net.qh + // on connection, client sends all of these + case "name": case "rate": case "rate_burstsize": case "playermodel": case "playerskin": case "clientversion": + if(!IS_CLIENT(this)) break; + // else fall through to default: flood control default: - if (SV_ParseClientCommand_floodcheck(this)) break; // "true": continue, as we're not flooding yet - else return; // "false": not allowed to continue, halt // print("^1ERROR: ^7ANTISPAM CAUGHT: ", command, ".\n"); + if (!timeout_status) // not while paused + { + entity store = IS_CLIENT(this) ? CS(this) : this; // unfortunately, we need to store these on the client initially + // this is basically the same as the chat flood control + if (time < store.cmd_floodtime) + { + sprint(this, strcat("^3CMD FLOOD CONTROL: wait ^1", ftos(store.cmd_floodtime - time), "^3 seconds, command was: ", command, "\n")); + return; // too much spam, halt + } + else + store.cmd_floodtime = max(time - autocvar_sv_clientcommand_antispam_count * autocvar_sv_clientcommand_antispam_time, store.cmd_floodtime) + autocvar_sv_clientcommand_antispam_time; + } + break; // continue, as we're not flooding yet } /* NOTE: should this be disabled? It can be spammy perhaps, but hopefully it's okay for now */ @@ -918,8 +1067,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 ^7, where possible commands are listed above.\n"); + sprint(this, "For help about a specific command, type cmd help \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