X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fcmd.qc;h=33f5716658b13a3bff9bb44513f8259b61e80748;hb=3cfa3eaf6856fe76f7fd8c945fbfab2e9e28014c;hp=1cbc699aeff1d9ab576cfce2883a579f0fb754f5;hpb=fb7b625a2f9482eb9ae538f15d172b2fcb9742dc;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 1cbc699ae..47e94f520 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -1,18 +1,22 @@ #include "cmd.qh" -#include + +#include +#include + +#include #include "common.qh" #include "vote.qh" #include "../campaign.qh" #include "../cheats.qh" -#include "../cl_player.qh" +#include "../player.qh" #include "../ipban.qh" #include "../mapvoting.qh" #include "../scores.qh" #include "../teamplay.qh" -#include "../mutators/all.qh" +#include "../mutators/_mod.qh" #ifdef SVQC #include @@ -30,8 +34,8 @@ #include -#include -#include +#include +#include #include #include @@ -45,17 +49,19 @@ void ClientKill_TeamChange(entity this, float targetteam); // 0 = don't change, 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 { - if (time <= (this.cmd_floodtime + autocvar_sv_clientcommand_antispam_time)) + if (time <= (store.cmd_floodtime + autocvar_sv_clientcommand_antispam_time)) { - this.cmd_floodcount += 1; - if (this.cmd_floodcount > autocvar_sv_clientcommand_antispam_count) return false; // too much spam, halt + store.cmd_floodcount += 1; + if (store.cmd_floodcount > autocvar_sv_clientcommand_antispam_count) return false; // too much spam, halt } else { - this.cmd_floodtime = time; - this.cmd_floodcount = 1; + store.cmd_floodtime = time; + store.cmd_floodcount = 1; } } return true; // continue, as we're not flooding yet @@ -74,8 +80,8 @@ void ClientCommand_autoswitch(entity caller, float request, float argc) { if (argv(1) != "") { - caller.autoswitch = InterpretBoolean(argv(1)); - sprint(caller, strcat("^1autoswitch is currently turned ", (caller.autoswitch ? "on" : "off"), ".\n")); + CS(caller).autoswitch = InterpretBoolean(argv(1)); + sprint(caller, strcat("^1autoswitch is currently turned ", (CS(caller).autoswitch ? "on" : "off"), ".\n")); return; } } @@ -101,11 +107,11 @@ void ClientCommand_clientversion(entity caller, float request, float argc) // i { if (IS_CLIENT(caller)) { - caller.version = ((argv(1) == "$gameversion") ? 1 : stof(argv(1))); + CS(caller).version = ((argv(1) == "$gameversion") ? 1 : stof(argv(1))); - if (caller.version < autocvar_gameversion_min || caller.version > autocvar_gameversion_max) + if (CS(caller).version < autocvar_gameversion_min || CS(caller).version > autocvar_gameversion_max) { - caller.version_mismatch = 1; + CS(caller).version_mismatch = true; ClientKill_TeamChange(caller, -2); // observe } else if (autocvar_g_campaign || autocvar_g_balance_teams) @@ -159,33 +165,19 @@ void ClientCommand_mv_getpicture(entity caller, float request, float argc) // i } } +bool joinAllowed(entity this); +void Join(entity this); void ClientCommand_join(entity caller, float request) { switch (request) { case CMD_REQUEST_COMMAND: { - if (IS_CLIENT(caller)) - { - if (!IS_PLAYER(caller) && !lockteams && !gameover) - { - if (caller.caplayer) return; - if (nJoinAllowed(caller, caller)) - { - if (autocvar_g_campaign) campaign_bots_may_start = true; - TRANSMUTE(Player, caller); - PlayerScore_Clear(caller); - Kill_Notification(NOTIF_ONE_ONLY, caller, MSG_CENTER, CPID_PREVENT_JOIN); - Send_Notification(NOTIF_ALL, world, MSG_INFO, ((teamplay && caller.team != -1) ? APP_TEAM_ENT(caller, INFO_JOIN_PLAY_TEAM) : INFO_JOIN_PLAY), caller.netname); - WITHSELF(caller, PutClientInServer()); - } - else - { - // player may not join because of g_maxplayers is set - Send_Notification(NOTIF_ONE_ONLY, caller, MSG_CENTER, CENTER_JOIN_PREVENT); - } - } - } + if (!game_stopped) + if (IS_CLIENT(caller) && !IS_PLAYER(caller)) + if (joinAllowed(caller)) + Join(caller); + return; // never fall through to usage } @@ -228,7 +220,7 @@ void ClientCommand_physics(entity caller, float request, float argc) } default: - sprint(caller, strcat("Current physics set: ^3", caller.cvar_cl_physics, "\n")); + sprint(caller, strcat("Current physics set: ^3", CS(caller).cvar_cl_physics, "\n")); case CMD_REQUEST_USAGE: { sprint(caller, "\nUsage:^3 cmd physics \n"); @@ -247,21 +239,21 @@ void ClientCommand_ready(entity caller, float request) // todo: anti-spam for t { if (IS_CLIENT(caller)) { - if (warmup_stage || autocvar_sv_ready_restart || g_race_qualifying == 2) + if (warmup_stage || sv_ready_restart || g_race_qualifying == 2) { - if (!readyrestart_happened || autocvar_sv_ready_restart_repeatable) + if (!readyrestart_happened || sv_ready_restart_repeatable) { if (time < game_starttime) // game is already restarting return; if (caller.ready) // toggle { caller.ready = false; - bprint(caller.netname, "^2 is ^1NOT^2 ready\n"); + bprint(playername(caller, false), "^2 is ^1NOT^2 ready\n"); } else { caller.ready = true; - bprint(caller.netname, "^2 is ready\n"); + bprint(playername(caller, false), "^2 is ready\n"); } // cannot reset the game while a timeout is active! @@ -292,7 +284,7 @@ void ClientCommand_say(entity caller, float request, float argc, string command) { case CMD_REQUEST_COMMAND: { - if (argc >= 2) Say(caller, false, world, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); + if (argc >= 2) Say(caller, false, NULL, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); return; // never fall through to usage } @@ -312,7 +304,7 @@ void ClientCommand_say_team(entity caller, float request, float argc, string com { case CMD_REQUEST_COMMAND: { - if (argc >= 2) Say(caller, true, world, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); + if (argc >= 2) Say(caller, true, NULL, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); return; // never fall through to usage } @@ -326,86 +318,97 @@ void ClientCommand_say_team(entity caller, float request, float argc, string com } } +.bool team_selected; void ClientCommand_selectteam(entity caller, float request, float argc) { switch (request) { case CMD_REQUEST_COMMAND: { - if (argv(1) != "") + if (argv(1) == "") { - if (IS_CLIENT(caller)) + return; + } + if (!IS_CLIENT(caller)) + { + return; + } + if (!teamplay) + { + sprint(caller, "^7selectteam can only be used in teamgames\n"); + return; + } + if (caller.team_forced > 0) + { + sprint(caller, "^7selectteam can not be used as your team is forced\n"); + return; + } + if (lockteams) + { + sprint(caller, "^7The game has already begun, you must wait until the next map to be able to join a team.\n"); + return; + } + float selection; + switch (argv(1)) + { + case "red": { - if (teamplay) - { - if (caller.team_forced <= 0) - { - if (!lockteams) - { - float selection; - - switch (argv(1)) - { - case "red": selection = NUM_TEAM_1; - break; - case "blue": selection = NUM_TEAM_2; - break; - case "yellow": selection = NUM_TEAM_3; - break; - case "pink": selection = NUM_TEAM_4; - break; - case "auto": selection = (-1); - break; - - default: selection = 0; - break; - } - - if (selection) - { - if (caller.team == selection && !IS_DEAD(caller)) - { - sprint(caller, "^7You already are on that team.\n"); - } - else if (caller.wasplayer && autocvar_g_changeteam_banned) - { - sprint(caller, "^1You cannot change team, forbidden by the server.\n"); - } - else - { - if (autocvar_g_balance_teams && autocvar_g_balance_teams_prevent_imbalance) - { - CheckAllowedTeams(caller); - GetTeamCounts(caller); - if (!TeamSmallerEqThanTeam(Team_TeamToNumber(selection), Team_TeamToNumber(caller.team), caller)) - { - Send_Notification(NOTIF_ONE, caller, MSG_INFO, INFO_TEAMCHANGE_LARGERTEAM); - return; - } - } - ClientKill_TeamChange(caller, selection); - } - } - } - else - { - sprint(caller, "^7The game has already begun, you must wait until the next map to be able to join a team.\n"); - } - } - else - { - sprint(caller, "^7selectteam can not be used as your team is forced\n"); - } - } - else - { - sprint(caller, "^7selectteam can only be used in teamgames\n"); - } + selection = NUM_TEAM_1; + break; + } + case "blue": + { + selection = NUM_TEAM_2; + break; + } + case "yellow": + { + selection = NUM_TEAM_3; + break; + } + case "pink": + { + selection = NUM_TEAM_4; + break; + } + case "auto": + { + selection = (-1); + break; } + default: + { + return; + } + } + if (caller.team == selection && selection != -1 && !IS_DEAD(caller)) + { + sprint(caller, "^7You already are on that team.\n"); return; } + if (CS(caller).wasplayer && autocvar_g_changeteam_banned) + { + sprint(caller, "^1You cannot change team, forbidden by the server.\n"); + return; + } + if ((selection != -1) && autocvar_g_balance_teams && + autocvar_g_balance_teams_prevent_imbalance) + { + CheckAllowedTeams(caller); + GetTeamCounts(caller); + if ((BIT(Team_TeamToNumber(selection) - 1) & FindBestTeams(caller, false)) == 0) + { + Send_Notification(NOTIF_ONE, caller, MSG_INFO, INFO_TEAMCHANGE_LARGERTEAM); + return; + } + } + ClientKill_TeamChange(caller, selection); + if (!IS_PLAYER(caller)) + { + caller.team_selected = true; // avoids asking again for team selection on join + } + return; } - default: sprint(caller, "Incorrect parameters for ^2selectteam^7\n"); case CMD_REQUEST_USAGE: @@ -459,7 +462,7 @@ void ClientCommand_sentcvar(entity caller, float request, float argc, string com tokenize_console(s); } - GetCvars(caller, 1); + GetCvars(caller, CS(caller), 1); return; } @@ -482,22 +485,35 @@ void ClientCommand_spectate(entity caller, float request) { case CMD_REQUEST_COMMAND: { - if (IS_CLIENT(caller)) + if (!intermission_running && IS_CLIENT(caller)) { + if((IS_SPEC(caller) || IS_OBSERVER(caller)) && argv(1) != "") + { + entity client = GetFilteredEntity(argv(1)); + int spec_accepted = VerifyClientEntity(client, false, false); + if(spec_accepted > 0 && IS_PLAYER(client)) + { + if(Spectate(caller, client)) + return; // fall back to regular handling + } + } + int mutator_returnvalue = MUTATOR_CALLHOOK(ClientCommand_Spectate, caller); if (mutator_returnvalue == MUT_SPECCMD_RETURN) return; - if ((IS_PLAYER(caller) || mutator_returnvalue == MUT_SPECCMD_FORCE) && autocvar_sv_spectate == 1) ClientKill_TeamChange(caller, -2); // observe + if ((IS_PLAYER(caller) || mutator_returnvalue == MUT_SPECCMD_FORCE)) + if (autocvar_sv_spectate == 1) + ClientKill_TeamChange(caller, -2); // observe } - return; // never fall through to usage + return; // never fall through to usage } default: case CMD_REQUEST_USAGE: { - sprint(caller, "\nUsage:^3 cmd spectate\n"); - sprint(caller, " No arguments required.\n"); + sprint(caller, "\nUsage:^3 cmd spectate \n"); + sprint(caller, " Where 'client' can be the player to spectate.\n"); return; } } @@ -535,6 +551,12 @@ void ClientCommand_tell(entity caller, float request, float argc, string command { if (argc >= 3) { + if(!IS_CLIENT(caller) && IS_REAL_CLIENT(caller)) // connecting + { + print_to(caller, "You can't ^2tell^7 a message while connecting."); + return; + } + entity tell_to = GetIndexedEntity(argc, 1); float tell_accepted = VerifyClientEntity(tell_to, true, false); @@ -560,7 +582,7 @@ void ClientCommand_tell(entity caller, float request, float argc, string command } else if (argv(1) == "#0") { - trigger_magicear_processmessage_forallears(caller, -1, world, substring(command, argv_start_index(next_token), argv_end_index(-1) - argv_start_index(next_token))); + trigger_magicear_processmessage_forallears(caller, -1, NULL, substring(command, argv_start_index(next_token), argv_end_index(-1) - argv_start_index(next_token))); return; } else { print_to(caller, strcat("tell: ", GetClientErrorString(tell_accepted, argv(1)), ".")); return; } @@ -592,8 +614,10 @@ void ClientCommand_voice(entity caller, float request, float argc, string comman sprint(caller, sprintf("Invalid voice. Use one of: %s\n", allvoicesamples)); return; } - if (argc >= 3) VoiceMessage(caller, e, substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2))); - else VoiceMessage(caller, e, ""); + string msg = ""; + if (argc >= 3) + msg = substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2)); + VoiceMessage(caller, e, msg); return; } @@ -704,8 +728,8 @@ void ClientCommand_macro_write_aliases(float fh) // ====================================== // If this function exists, server game code parses clientcommand before the engine code gets it. -void SV_ParseClientCommand(string command) -{ENGINE_EVENT(); +void SV_ParseClientCommand(entity this, string command) +{ // If invalid UTF-8, don't even parse it string command2 = ""; float len = strlen(command);