X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fcmd.qc;h=66161af241a0bbf39c5375a9ea7a5eb4f94aef47;hb=6f07b9a66403cc921d651ce87305f02426181051;hp=6928957d6d812e6f15511d2b82e421d8f0c7f877;hpb=4ae3dd6b9141d0367deb73632255548710d81781;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 6928957d6..66161af24 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -1,49 +1,39 @@ #include "cmd.qh" -#include -#include - #include - -#include "common.qh" -#include "vote.qh" - -#include "../bot/api.qh" - -#include "../campaign.qh" -#include "../cheats.qh" -#include "../client.qh" -#include "../clientkill.qh" -#include "../player.qh" -#include "../ipban.qh" -#include "../mapvoting.qh" -#include "../scores.qh" -#include "../teamplay.qh" - -#include -#include - -#ifdef SVQC - #include -#endif - #include #include #include +#include #include -#include -#include -#include -#include #include - #include - #include -#include #include - +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // ========================================================= // Server side networked commands code, reworked by Samual @@ -83,14 +73,14 @@ void ClientCommand_autoswitch(entity caller, int request, int argc) { if (argv(1) != "") { - CS(caller).autoswitch = InterpretBoolean(argv(1)); - sprint(caller, strcat("^1autoswitch is currently turned ", (CS(caller).autoswitch ? "on" : "off"), ".\n")); + CS_CVAR(caller).autoswitch = InterpretBoolean(argv(1)); + sprint(caller, strcat("^1autoswitch is currently turned ", (CS_CVAR(caller).autoswitch ? "on" : "off"), ".\n")); return; } } default: - sprint(caller, "Incorrect parameters for ^2autoswitch^7\n"); + sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0))); case CMD_REQUEST_USAGE: { sprint(caller, "\nUsage:^3 cmd autoswitch selection\n"); @@ -133,7 +123,7 @@ void ClientCommand_clientversion(entity caller, int request, int argc) // inter } default: - sprint(caller, "Incorrect parameters for ^2clientversion^7\n"); + sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0))); case CMD_REQUEST_USAGE: { sprint(caller, "\nUsage:^3 cmd clientversion version\n"); @@ -158,7 +148,7 @@ void ClientCommand_mv_getpicture(entity caller, int request, int argc) // inter } default: - sprint(caller, "Incorrect parameters for ^2mv_getpicture^7\n"); + 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"); @@ -248,7 +238,7 @@ void ClientCommand_wpeditor(entity caller, int request, int argc) } default: - sprint(caller, "Incorrect parameters for ^2wpeditor^7\n"); + sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0))); case CMD_REQUEST_USAGE: { sprint(caller, "\nUsage:^3 cmd wpeditor action\n"); @@ -285,10 +275,13 @@ void ClientCommand_join(entity caller, int request) { case CMD_REQUEST_COMMAND: { - if (!game_stopped) - if (IS_CLIENT(caller) && !IS_PLAYER(caller)) - if (joinAllowed(caller)) - Join(caller); + if (!game_stopped && IS_CLIENT(caller) && !IS_PLAYER(caller)) + { + if (joinAllowed(caller)) + Join(caller); + else if(time < CS(caller).jointime + MIN_SPEC_TIME) + CS(caller).autojoin_checked = -1; + } return; // never fall through to usage } @@ -362,7 +355,7 @@ void ClientCommand_physics(entity caller, int request, int argc) } default: - sprint(caller, strcat("Current physics set: ^3", CS(caller).cvar_cl_physics, "\n")); + sprint(caller, strcat("Current physics set: ^3", CS_CVAR(caller).cvar_cl_physics, "\n")); case CMD_REQUEST_USAGE: { sprint(caller, "\nUsage:^3 cmd physics \n"); @@ -381,9 +374,9 @@ void ClientCommand_ready(entity caller, int request) // todo: anti-spam for tog { if (IS_CLIENT(caller)) { - if (warmup_stage || sv_ready_restart || g_race_qualifying == 2) + if (warmup_stage || autocvar_sv_ready_restart || g_race_qualifying == 2) { - if (!readyrestart_happened || sv_ready_restart_repeatable) + if (!readyrestart_happened || autocvar_sv_ready_restart_repeatable) { if (time < game_starttime) // game is already restarting return; @@ -391,13 +384,13 @@ void ClientCommand_ready(entity caller, int request) // todo: anti-spam for tog { caller.ready = false; if(IS_PLAYER(caller) || caller.caplayer == 1) - bprint(playername(caller, false), "^2 is ^1NOT^2 ready\n"); + 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, false), "^2 is ready\n"); + bprint(playername(caller.netname, caller.team, false), "^2 is ready\n"); } // cannot reset the game while a timeout is active! @@ -493,40 +486,11 @@ void ClientCommand_selectteam(entity caller, int request, int argc) 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": - { - 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)) + + float team_num = Team_ColorToTeam(argv(1)); + if (team_num == -1) // invalid + return; + if (caller.team == team_num && team_num && !IS_DEAD(caller)) { sprint(caller, "^7You already are on that team.\n"); return; @@ -536,12 +500,11 @@ void ClientCommand_selectteam(entity caller, int request, int argc) 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) + if (team_num && autocvar_g_balance_teams && autocvar_g_balance_teams_prevent_imbalance) { entity balance = TeamBalance_CheckAllowedTeams(caller); TeamBalance_GetTeamCounts(balance, caller); - if ((Team_IndexToBit(Team_TeamToIndex(selection)) & + if ((Team_IndexToBit(Team_TeamToIndex(team_num)) & TeamBalance_FindBestTeams(balance, caller, false)) == 0) { Send_Notification(NOTIF_ONE, caller, MSG_INFO, INFO_TEAMCHANGE_LARGERTEAM); @@ -550,7 +513,11 @@ void ClientCommand_selectteam(entity caller, int request, int argc) } TeamBalance_Destroy(balance); } - ClientKill_TeamChange(caller, selection); + if (team_num) + ClientKill_TeamChange(caller, team_num); + else // auto + ClientKill_TeamChange(caller, -1); + if (!IS_PLAYER(caller)) { caller.team_selected = true; // avoids asking again for team selection on join @@ -558,7 +525,7 @@ void ClientCommand_selectteam(entity caller, int request, int argc) return; } default: - sprint(caller, "Incorrect parameters for ^2selectteam^7\n"); + sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0))); case CMD_REQUEST_USAGE: { sprint(caller, "\nUsage:^3 cmd selectteam team\n"); @@ -583,7 +550,7 @@ void ClientCommand_selfstuff(entity caller, int request, string command) } default: - sprint(caller, "Incorrect parameters for ^2selfstuff^7\n"); + sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0))); case CMD_REQUEST_USAGE: { sprint(caller, "\nUsage:^3 cmd selfstuff \n"); @@ -610,14 +577,14 @@ void ClientCommand_sentcvar(entity caller, int request, int argc, string command tokenize_console(s); } - GetCvars(caller, CS(caller), 1); + GetCvars(caller, CS_CVAR(caller), 1); return; } } default: - sprint(caller, "Incorrect parameters for ^2sentcvar^7\n"); + sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0))); case CMD_REQUEST_USAGE: { sprint(caller, "\nUsage:^3 cmd sentcvar \n"); @@ -635,15 +602,25 @@ void ClientCommand_spectate(entity caller, int request) { if (!intermission_running && IS_CLIENT(caller)) { - if((IS_SPEC(caller) || IS_OBSERVER(caller)) && argv(1) != "") + if(argv(1) != "") { - entity client = GetFilteredEntity(argv(1)); - int spec_accepted = VerifyClientEntity(client, false, false); - if(spec_accepted > 0 && IS_PLAYER(client)) + if(IS_SPEC(caller) || IS_OBSERVER(caller)) { - if(Spectate(caller, client)) - return; // fall back to regular handling + entity client = GetFilteredEntity(argv(1)); + int spec_accepted = VerifyClientEntity(client, false, false); + if(spec_accepted > 0 && IS_PLAYER(client)) + { + bool caller_is_observer = (IS_OBSERVER(caller)); + Spectate(caller, client); + if (caller_is_observer) + TRANSMUTE(Spectator, caller); + } + else + sprint(caller, "Can't spectate ", argv(1), "^7\n"); } + else + sprint(caller, "cmd spectate client only works when you are spectator/observer\n"); + return; } int mutator_returnvalue = MUTATOR_CALLHOOK(ClientCommand_Spectate, caller); @@ -660,7 +637,7 @@ void ClientCommand_spectate(entity caller, int request) default: case CMD_REQUEST_USAGE: { - sprint(caller, "\nUsage:^3 cmd spectate \n"); + sprint(caller, "\nUsage:^3 cmd spectate [client]\n"); sprint(caller, " Where 'client' can be the player to spectate.\n"); return; } @@ -681,7 +658,7 @@ void ClientCommand_suggestmap(entity caller, int request, int argc) } default: - sprint(caller, "Incorrect parameters for ^2suggestmap^7\n"); + sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0))); case CMD_REQUEST_USAGE: { sprint(caller, "\nUsage:^3 cmd suggestmap map\n"); @@ -738,7 +715,7 @@ void ClientCommand_tell(entity caller, int request, int argc, string command) } default: - sprint(caller, "Incorrect parameters for ^2tell^7\n"); + sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0))); case CMD_REQUEST_USAGE: { sprint(caller, "\nUsage:^3 cmd tell client \n"); @@ -784,7 +761,7 @@ void ClientCommand_voice(entity caller, int request, int argc, string command) } default: - sprint(caller, "Incorrect parameters for ^2voice^7\n"); + sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0))); case CMD_REQUEST_USAGE: { sprint(caller, "\nUsage:^3 cmd voice messagetype \n"); @@ -922,7 +899,15 @@ 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 "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 default: