X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fcmd.qc;h=5c052e2d91e70fa45393b558bc5cc50fff772352;hb=6c2a06243103ad575d9b202dbbf4fb68def1234e;hp=cc8e19673a4760e257894d768ced8c11d8aad771;hpb=bc996d1cf2bb0de381c06a2ad07bed5d333e3e84;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index cc8e19673..5c052e2d9 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -1,6 +1,5 @@ -#include "../../common/command/command.qh" +#include #include "cmd.qh" -#include "../_all.qh" #include "common.qh" #include "vote.qh" @@ -13,26 +12,30 @@ #include "../scores.qh" #include "../teamplay.qh" -#include "../mutators/mutators_include.qh" +#include "../mutators/all.qh" #ifdef SVQC - #include "../vehicles/vehicle.qh" + #include #endif -#include "../../common/constants.qh" -#include "../../common/deathtypes.qh" -#include "../../common/mapinfo.qh" -#include "../../common/notifications.qh" -#include "../../common/teams.qh" -#include "../../common/util.qh" +#include +#include +#include +#include +#include +#include +#include +#include -#include "../../common/monsters/all.qc" -#include "../../common/monsters/spawn.qh" -#include "../../common/monsters/sv_monsters.qh" +#include -#include "../../warpzonelib/common.qh" +#include +#include +#include -void ClientKill_TeamChange (float targetteam); // 0 = don't change, -1 = auto, -2 = spec +#include + +void ClientKill_TeamChange(float targetteam); // 0 = don't change, -1 = auto, -2 = spec // ========================================================= // Server side networked commands code, reworked by Samual @@ -41,12 +44,13 @@ void ClientKill_TeamChange (float targetteam); // 0 = don't change, -1 = auto, - float SV_ParseClientCommand_floodcheck() { - if (!timeout_status) // not while paused + SELFPARAM(); + if (!timeout_status) // not while paused { - if(time <= (self.cmd_floodtime + autocvar_sv_clientcommand_antispam_time)) + if (time <= (self.cmd_floodtime + autocvar_sv_clientcommand_antispam_time)) { self.cmd_floodcount += 1; - if(self.cmd_floodcount > autocvar_sv_clientcommand_antispam_count) { return false; } // too much spam, halt + if (self.cmd_floodcount > autocvar_sv_clientcommand_antispam_count) return false; // too much spam, halt } else { @@ -54,7 +58,7 @@ float SV_ParseClientCommand_floodcheck() self.cmd_floodcount = 1; } } - return true; // continue, as we're not flooding yet + return true; // continue, as we're not flooding yet } @@ -64,11 +68,12 @@ float SV_ParseClientCommand_floodcheck() void ClientCommand_autoswitch(float request, float argc) { - switch(request) + SELFPARAM(); + switch (request) { case CMD_REQUEST_COMMAND: { - if(argv(1) != "") + if (argv(1) != "") { self.autoswitch = InterpretBoolean(argv(1)); sprint(self, strcat("^1autoswitch is currently turned ", (self.autoswitch ? "on" : "off"), ".\n")); @@ -87,52 +92,31 @@ void ClientCommand_autoswitch(float request, float argc) } } -void ClientCommand_checkfail(float request, string command) // internal command, used only by code -{ - switch(request) - { - case CMD_REQUEST_COMMAND: - { - printf("CHECKFAIL: %s (%s) epically failed check %s\n", self.netname, self.netaddress, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1))); - self.checkfail = 1; - return; // never fall through to usage - } - - default: - sprint(self, "Incorrect parameters for ^2checkfail^7\n"); - case CMD_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd checkfail \n"); - sprint(self, " Where 'message' is the message reported by client about the fail.\n"); - return; - } - } -} - -void ClientCommand_clientversion(float request, float argc) // internal command, used only by code +void ClientCommand_clientversion(float request, float argc) // internal command, used only by code { - switch(request) + SELFPARAM(); + switch (request) { case CMD_REQUEST_COMMAND: { - if(argv(1) != "") + if (argv(1) != "") { - if(IS_CLIENT(self)) + if (IS_CLIENT(self)) { self.version = ((argv(1) == "$gameversion") ? 1 : stof(argv(1))); - if(self.version < autocvar_gameversion_min || self.version > autocvar_gameversion_max) + if (self.version < autocvar_gameversion_min || self.version > autocvar_gameversion_max) { self.version_mismatch = 1; - ClientKill_TeamChange(-2); // observe + ClientKill_TeamChange(-2); // observe } - else if(autocvar_g_campaign || autocvar_g_balance_teams) + else if (autocvar_g_campaign || autocvar_g_balance_teams) { - //JoinBestTeam(self, false, true); + // JoinBestTeam(self, false, true); } - else if(teamplay && !autocvar_sv_spectate && !(self.team_forced > 0)) + else if (teamplay && !autocvar_sv_spectate && !(self.team_forced > 0)) { - self.classname = "observer"; // really? + self.classname = STR_OBSERVER; // really? stuffcmd(self, "menu_showteamselect\n"); } } @@ -152,16 +136,16 @@ void ClientCommand_clientversion(float request, float argc) // internal command, } } -void ClientCommand_mv_getpicture(float request, float argc) // internal command, used only by code +void ClientCommand_mv_getpicture(float request, float argc) // internal command, used only by code { - switch(request) + SELFPARAM(); + switch (request) { case CMD_REQUEST_COMMAND: { - if(argv(1) != "") + if (argv(1) != "") { - if(intermission_running) - MapVote_SendPicture(stof(argv(1))); + if (intermission_running) MapVote_SendPicture(stof(argv(1))); return; } @@ -180,34 +164,33 @@ void ClientCommand_mv_getpicture(float request, float argc) // internal command, void ClientCommand_join(float request) { - switch(request) + SELFPARAM(); + switch (request) { case CMD_REQUEST_COMMAND: { - if(IS_CLIENT(self)) + if (IS_CLIENT(self)) { - if(!IS_PLAYER(self) && !lockteams && !gameover) + if (!IS_PLAYER(self) && !lockteams && !gameover) { - if(self.caplayer) - return; - if(nJoinAllowed(self)) + if (self.caplayer) return; + if (nJoinAllowed(self, self)) { - if(autocvar_g_campaign) { campaign_bots_may_start = 1; } - - self.classname = "player"; + if (autocvar_g_campaign) campaign_bots_may_start = 1; + self.classname = STR_PLAYER; PlayerScore_Clear(self); Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER_CPID, CPID_PREVENT_JOIN); - Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_JOIN_PLAY, self.netname); + Send_Notification(NOTIF_ALL, world, MSG_INFO, ((teamplay) ? APP_TEAM_ENT_4(this, INFO_JOIN_PLAY_TEAM_) : INFO_JOIN_PLAY), self.netname); PutClientInServer(); } else { - //player may not join because of g_maxplayers is set + // player may not join because of g_maxplayers is set Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_JOIN_PREVENT); } } } - return; // never fall through to usage + return; // never fall through to usage } default: @@ -220,191 +203,35 @@ void ClientCommand_join(float request) } } -void ClientCommand_mobedit(float request, float argc) -{ - switch(request) - { - case CMD_REQUEST_COMMAND: - { - if(argv(1) && argv(2)) - { - makevectors(self.v_angle); - WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * 100, MOVE_NORMAL, self); - - if(!autocvar_g_monsters_edit) { sprint(self, "Monster property editing is not enabled.\n"); return; } - if(trace_ent.flags & FL_MONSTER) - { - if(trace_ent.realowner != self) { sprint(self, "That monster does not belong to you.\n"); return; } - switch(argv(1)) - { - case "skin": - { - if(trace_ent.monsterid != MON_MAGE.monsterid) - trace_ent.skin = stof(argv(2)); - return; - } - case "movetarget": - { - trace_ent.monster_moveflags = stof(argv(2)); - return; - } - } - } - } - } - default: - sprint(self, "Incorrect parameters for ^2mobedit^7\n"); - case CMD_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd mobedit [argument]\n"); - sprint(self, " Where 'argument' can be skin or movetarget.\n"); - sprint(self, " Aim at your monster to edit its properties.\n"); - return; - } - } -} - -void ClientCommand_mobkill(float request) -{ - switch(request) - { - case CMD_REQUEST_COMMAND: - { - makevectors(self.v_angle); - WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * 100, MOVE_NORMAL, self); - - if(trace_ent.flags & FL_MONSTER) - { - if(trace_ent.realowner != self) - { - sprint(self, "That monster does not belong to you.\n"); - return; - } - sprint(self, strcat("Your pet '", trace_ent.monster_name, "' has been brutally mutilated.\n")); - Damage (trace_ent, world, world, trace_ent.health + trace_ent.max_health + 200, DEATH_KILL, trace_ent.origin, '0 0 0'); - return; - } - } - - default: - sprint(self, "Incorrect parameters for ^2mobkill^7\n"); - case CMD_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd mobkill\n"); - sprint(self, " Aim at your monster to kill it.\n"); - return; - } - } -} - -void ClientCommand_mobspawn(float request, float argc) -{ - switch(request) - { - case CMD_REQUEST_COMMAND: - { - entity e; - string tospawn; - float moveflag, monstercount = 0; - - moveflag = (argv(2) ? stof(argv(2)) : 1); // follow owner if not defined - tospawn = strtolower(argv(1)); - - if(tospawn == "list") - { - sprint(self, monsterlist_reply); - return; - } - - FOR_EACH_MONSTER(e) - { - if(e.realowner == self) - ++monstercount; - } - - if(autocvar_g_monsters_max <= 0 || autocvar_g_monsters_max_perplayer <= 0) { sprint(self, "Monster spawning is disabled.\n"); return; } - else if(!IS_PLAYER(self)) { sprint(self, "You can't spawn monsters while spectating.\n"); return; } - else if(MUTATOR_CALLHOOK(AllowMobSpawning)) { sprint(self, "Monster spawning is currently disabled by a mutator.\n"); return; } - else if(!autocvar_g_monsters) { Send_Notification(NOTIF_ONE, self, MSG_INFO, INFO_MONSTERS_DISABLED); return; } - else if(self.vehicle) { sprint(self, "You can't spawn monsters while driving a vehicle.\n"); return; } - else if(self.frozen) { sprint(self, "You can't spawn monsters while frozen.\n"); return; } - else if(autocvar_g_campaign) { sprint(self, "You can't spawn monsters in campaign mode.\n"); return; } - else if(self.deadflag != DEAD_NO) { sprint(self, "You can't spawn monsters while dead.\n"); return; } - else if(monstercount >= autocvar_g_monsters_max_perplayer) { sprint(self, "You have spawned too many monsters, kill some before trying to spawn any more.\n"); return; } - else if(totalspawned >= autocvar_g_monsters_max) { sprint(self, "The global maximum monster count has been reached, kill some before trying to spawn any more.\n"); return; } - else if(tospawn != "") - { - float found = 0, i; - entity mon; - - for(i = MON_FIRST; i <= MON_LAST; ++i) - { - mon = get_monsterinfo(i); - if(mon.netname == tospawn) - { - found = true; - break; - } - } - - if(found || tospawn == "random") - { - totalspawned += 1; - - makevectors(self.v_angle); - WarpZone_TraceBox (CENTER_OR_VIEWOFS(self), PL_MIN, PL_MAX, CENTER_OR_VIEWOFS(self) + v_forward * 150, true, self); - //WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * 150, MOVE_NORMAL, self); - - e = spawnmonster(tospawn, 0, self, self, trace_endpos, false, false, moveflag); - - sprint(self, strcat("Spawned ", e.monster_name, "\n")); - - return; - } - } - } - - default: - sprint(self, "Incorrect parameters for ^2mobspawn^7\n"); - case CMD_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd mobspawn [movetype]\n"); - sprint(self, " See 'cmd mobspawn list' for available monsters.\n"); - sprint(self, " Argument 'random' spawns a random monster.\n"); - sprint(self, " Monster will follow the owner if second argument is not defined.\n"); - return; - } - } -} - void ClientCommand_physics(float request, float argc) { - switch(request) + SELFPARAM(); + switch (request) { case CMD_REQUEST_COMMAND: { string command = strtolower(argv(1)); - - if(!autocvar_g_physics_clientselect) + + if (!autocvar_g_physics_clientselect) { sprint(self, "Client physics selection is currently disabled.\n"); return; } - if(command == "list" || command == "help") + if (command == "list" || command == "help") { sprint(self, strcat("Available physics sets: \n\n", autocvar_g_physics_clientselect_options, " default\n")); return; } - - if(Physics_Valid(command) || command == "default") + + if (Physics_Valid(command) || command == "default") { stuffcmd(self, strcat("\nseta cl_physics ", command, "\nsendcvar cl_physics\n")); sprint(self, strcat("^2Physics set successfully changed to ^3", command, "\n")); return; } } - + default: sprint(self, strcat("Current physics set: ^3", self.cvar_cl_physics, "\n")); case CMD_REQUEST_USAGE: @@ -417,21 +244,22 @@ void ClientCommand_physics(float request, float argc) } } -void ClientCommand_ready(float request) // todo: anti-spam for toggling readyness +void ClientCommand_ready(float request) // todo: anti-spam for toggling readyness { - switch(request) + SELFPARAM(); + switch (request) { case CMD_REQUEST_COMMAND: { - if(IS_CLIENT(self)) + if (IS_CLIENT(self)) { - if(warmup_stage || autocvar_sv_ready_restart || g_race_qualifying == 2) + if (warmup_stage || autocvar_sv_ready_restart || g_race_qualifying == 2) { - if(!readyrestart_happened || autocvar_sv_ready_restart_repeatable) + if (!readyrestart_happened || autocvar_sv_ready_restart_repeatable) { - if(time < game_starttime) // game is already restarting + if (time < game_starttime) // game is already restarting return; - if (self.ready) // toggle + if (self.ready) // toggle { self.ready = false; bprint(self.netname, "^2 is ^1NOT^2 ready\n"); @@ -443,14 +271,15 @@ void ClientCommand_ready(float request) // todo: anti-spam for toggling readynes } // cannot reset the game while a timeout is active! - if (!timeout_status) - ReadyCount(); - } else { + if (!timeout_status) ReadyCount(); + } + else + { sprint(self, "^1Game has already been restarted\n"); } } } - return; // never fall through to usage + return; // never fall through to usage } default: @@ -465,12 +294,13 @@ void ClientCommand_ready(float request) // todo: anti-spam for toggling readynes void ClientCommand_say(float request, float argc, string command) { - switch(request) + SELFPARAM(); + switch (request) { case CMD_REQUEST_COMMAND: { - if(argc >= 2) { Say(self, false, world, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); } - return; // never fall through to usage + if (argc >= 2) Say(self, false, world, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); + return; // never fall through to usage } default: @@ -485,12 +315,13 @@ void ClientCommand_say(float request, float argc, string command) void ClientCommand_say_team(float request, float argc, string command) { - switch(request) + SELFPARAM(); + switch (request) { case CMD_REQUEST_COMMAND: { - if(argc >= 2) { Say(self, true, world, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); } - return; // never fall through to usage + if (argc >= 2) Say(self, true, world, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); + return; // never fall through to usage } default: @@ -505,44 +336,57 @@ void ClientCommand_say_team(float request, float argc, string command) void ClientCommand_selectteam(float request, float argc) { - switch(request) + SELFPARAM(); + switch (request) { case CMD_REQUEST_COMMAND: { - if(argv(1) != "") + if (argv(1) != "") { - if(IS_CLIENT(self)) + if (IS_CLIENT(self)) { - if(teamplay) - if(self.team_forced <= 0) + if (teamplay) + { + if (self.team_forced <= 0) + { if (!lockteams) { float selection; - switch(argv(1)) + 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; + 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 (selection) { - if(self.team == selection && self.deadflag == DEAD_NO) + if (self.team == selection && !IS_DEAD(self)) + { sprint(self, "^7You already are on that team.\n"); - else if(self.wasplayer && autocvar_g_changeteam_banned) + } + else if (self.wasplayer && autocvar_g_changeteam_banned) + { sprint(self, "^1You cannot change team, forbidden by the server.\n"); + } else { - if(autocvar_g_balance_teams && autocvar_g_balance_teams_prevent_imbalance) + if (autocvar_g_balance_teams && autocvar_g_balance_teams_prevent_imbalance) { CheckAllowedTeams(self); GetTeamCounts(self); - if(!TeamSmallerEqThanTeam(Team_TeamToNumber(selection), Team_TeamToNumber(self.team), self)) + if (!TeamSmallerEqThanTeam(Team_TeamToNumber(selection), Team_TeamToNumber(self.team), self)) { Send_Notification(NOTIF_ONE, self, MSG_INFO, INFO_TEAMCHANGE_LARGERTEAM); return; @@ -553,11 +397,19 @@ void ClientCommand_selectteam(float request, float argc) } } else + { sprint(self, "^7The game has already begun, you must wait until the next map to be able to join a team.\n"); + } + } else + { sprint(self, "^7selectteam can not be used as your team is forced\n"); + } + } else + { sprint(self, "^7selectteam can only be used in teamgames\n"); + } } return; } @@ -577,11 +429,12 @@ void ClientCommand_selectteam(float request, float argc) void ClientCommand_selfstuff(float request, string command) { - switch(request) + SELFPARAM(); + switch (request) { case CMD_REQUEST_COMMAND: { - if(argv(1) != "") + if (argv(1) != "") { stuffcmd(self, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1))); return; @@ -601,16 +454,17 @@ void ClientCommand_selfstuff(float request, string command) void ClientCommand_sentcvar(float request, float argc, string command) { - switch(request) + SELFPARAM(); + switch (request) { case CMD_REQUEST_COMMAND: { - if(argv(1) != "") + if (argv(1) != "") { - //float tokens; + // float tokens; string s; - if(argc == 2) // undefined cvar: use the default value on the server then + 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)), "\""); tokenize_console(s); @@ -635,37 +489,20 @@ void ClientCommand_sentcvar(float request, float argc, string command) void ClientCommand_spectate(float request) { - switch(request) + SELFPARAM(); + switch (request) { case CMD_REQUEST_COMMAND: { - if(IS_CLIENT(self)) + if (IS_CLIENT(self)) { - if(g_lms) - { - if(self.lms_spectate_warning) - { - // for the forfeit message... - self.lms_spectate_warning = 2; - // mark player as spectator - PlayerScore_Add(self, SP_LMS_RANK, 666 - PlayerScore_Add(self, SP_LMS_RANK, 0)); - } - else - { - self.lms_spectate_warning = 1; - sprint(self, "WARNING: you won't be able to enter the game again after spectating in LMS. Use the same command again to spectate anyway.\n"); - return; - } - } + int mutator_returnvalue = MUTATOR_CALLHOOK(ClientCommand_Spectate, self); - if((IS_PLAYER(self) || self.caplayer) && autocvar_sv_spectate == 1) - { - if(self.caplayer && (IS_SPEC(self) || IS_OBSERVER(self))) - Send_Notification(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_CA_LEAVE); - ClientKill_TeamChange(-2); // observe - } + if (mutator_returnvalue == MUT_SPECCMD_RETURN) return; + + if ((IS_PLAYER(self) || mutator_returnvalue == MUT_SPECCMD_FORCE) && autocvar_sv_spectate == 1) ClientKill_TeamChange(-2); // observe } - return; // never fall through to usage + return; // never fall through to usage } default: @@ -680,11 +517,12 @@ void ClientCommand_spectate(float request) void ClientCommand_suggestmap(float request, float argc) { - switch(request) + SELFPARAM(); + switch (request) { case CMD_REQUEST_COMMAND: { - if(argv(1) != "") + if (argv(1) != "") { sprint(self, strcat(MapVote_Suggest(argv(1)), "\n")); return; @@ -704,25 +542,37 @@ void ClientCommand_suggestmap(float request, float argc) void ClientCommand_tell(float request, float argc, string command) { - switch(request) + SELFPARAM(); + switch (request) { case CMD_REQUEST_COMMAND: { - if(argc >= 3) + if (argc >= 3) { entity tell_to = GetIndexedEntity(argc, 1); float tell_accepted = VerifyClientEntity(tell_to, true, false); - if(tell_accepted > 0) // the target is a real client + if (tell_accepted > 0) // the target is a real client { - if(tell_to != self) // and we're allowed to send to them :D + if (tell_to != self) // and we're allowed to send to them :D { - Say(self, false, tell_to, substring(command, argv_start_index(next_token), argv_end_index(-1) - argv_start_index(next_token)), true); + // workaround for argv indexes indexing ascii chars instead of utf8 chars + // In this case when the player name contains utf8 chars + // the message gets partially trimmed in the beginning. + // Potentially this bug affects any substring call that uses + // argv_start_index and argv_end_index. + + string utf8_enable_save = cvar_string("utf8_enable"); + cvar_set("utf8_enable", "0"); + string msg = substring(command, argv_start_index(next_token), argv_end_index(-1) - argv_start_index(next_token)); + cvar_set("utf8_enable", utf8_enable_save); + + Say(self, false, tell_to, msg, true); return; } else { print_to(self, "You can't ^2tell^7 a message to yourself."); return; } } - else if(argv(1) == "#0") + else if (argv(1) == "#0") { trigger_magicear_processmessage_forallears(self, -1, world, substring(command, argv_start_index(next_token), argv_end_index(-1) - argv_start_index(next_token))); return; @@ -744,16 +594,21 @@ void ClientCommand_tell(float request, float argc, string command) void ClientCommand_voice(float request, float argc, string command) { - switch(request) + SELFPARAM(); + switch (request) { case CMD_REQUEST_COMMAND: { - if(argv(1) != "") + if (argv(1) != "") { - if(argc >= 3) - VoiceMessage(argv(1), substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2))); - else - VoiceMessage(argv(1), ""); + entity e = GetVoiceMessage(argv(1)); + if (!e) + { + sprint(this, sprintf("Invalid voice. Use one of: %s\n", allvoicesamples)); + return; + } + if (argc >= 3) VoiceMessage(this, e, substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2))); + else VoiceMessage(this, e, ""); return; } @@ -775,22 +630,22 @@ void ClientCommand_voice(float request, float argc, string command) ** ADD ALL NEW COMMANDS TO commands.cfg WITH PROPER ALIASES IN THE SAME FASHION! void ClientCommand_(float request) { - switch(request) - { - case CMD_REQUEST_COMMAND: - { - - return; // never fall through to usage - } - - default: - case CMD_REQUEST_USAGE: - { - sprint(self, "\nUsage:^3 cmd \n"); - sprint(self, " No arguments required.\n"); - return; - } - } + switch(request) + { + case CMD_REQUEST_COMMAND: + { + + return; // never fall through to usage + } + + default: + case CMD_REQUEST_USAGE: + { + sprint(self, "\nUsage:^3 cmd \n"); + sprint(self, " No arguments required.\n"); + return; + } + } } */ @@ -800,15 +655,11 @@ void ClientCommand_(float request) // ===================================== // Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;) -#define CLIENT_COMMANDS(request,arguments,command) \ +#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("mv_getpicture", ClientCommand_mv_getpicture(request, arguments), "Retrieve mapshot picture from the server") \ CLIENT_COMMAND("join", ClientCommand_join(request), "Become a player in the game") \ - CLIENT_COMMAND("mobedit", ClientCommand_mobedit(request, arguments), "Edit your monster's properties") \ - CLIENT_COMMAND("mobkill", ClientCommand_mobkill(request), "Kills your monster") \ - CLIENT_COMMAND("mobspawn", ClientCommand_mobspawn(request, arguments), "Spawn monsters infront of yourself") \ CLIENT_COMMAND("physics", ClientCommand_physics(request, arguments), "Change physics set") \ CLIENT_COMMAND("ready", ClientCommand_ready(request), "Qualify as ready to end warmup stage (or restart server if allowed)") \ CLIENT_COMMAND("say", ClientCommand_say(request, arguments, command), "Print a message to chat to all players") \ @@ -820,50 +671,48 @@ void ClientCommand_(float request) CLIENT_COMMAND("suggestmap", ClientCommand_suggestmap(request, arguments), "Suggest a map to the mapvote at match end") \ CLIENT_COMMAND("tell", ClientCommand_tell(request, arguments, command), "Send a message directly to a player") \ CLIENT_COMMAND("voice", ClientCommand_voice(request, arguments, command), "Send voice message via sound") \ + CLIENT_COMMAND("minigame", ClientCommand_minigame(request, arguments, command), "Start a minigame") \ /* nothing */ void ClientCommand_macro_help() { - #define CLIENT_COMMAND(name,function,description) \ + SELFPARAM(); + #define CLIENT_COMMAND(name, function, description) \ { sprint(self, " ^2", name, "^7: ", description, "\n"); } CLIENT_COMMANDS(0, 0, ""); - #undef CLIENT_COMMAND - - return; +#undef CLIENT_COMMAND } float ClientCommand_macro_command(float argc, string command) { - #define CLIENT_COMMAND(name,function,description) \ - { if(name == strtolower(argv(0))) { function; return true; } } + #define CLIENT_COMMAND(name, function, description) \ + { if (name == strtolower(argv(0))) { function; return true; } } CLIENT_COMMANDS(CMD_REQUEST_COMMAND, argc, command); - #undef CLIENT_COMMAND +#undef CLIENT_COMMAND return false; } float ClientCommand_macro_usage(float argc) { - #define CLIENT_COMMAND(name,function,description) \ - { if(name == strtolower(argv(1))) { function; return true; } } + #define CLIENT_COMMAND(name, function, description) \ + { if (name == strtolower(argv(1))) { function; return true; } } CLIENT_COMMANDS(CMD_REQUEST_USAGE, argc, ""); - #undef CLIENT_COMMAND +#undef CLIENT_COMMAND return false; } void ClientCommand_macro_write_aliases(float fh) { - #define CLIENT_COMMAND(name,function,description) \ + #define CLIENT_COMMAND(name, function, description) \ { CMD_Write_Alias("qc_cmd_cmd", name, description); } CLIENT_COMMANDS(0, 0, ""); - #undef CLIENT_COMMAND - - return; +#undef CLIENT_COMMAND } // ====================================== @@ -873,18 +722,17 @@ void ClientCommand_macro_write_aliases(float fh) void SV_ParseClientCommand(string command) { + SELFPARAM(); // If invalid UTF-8, don't even parse it string command2 = ""; float len = strlen(command); float i; for (i = 0; i < len; ++i) command2 = strcat(command2, chr2str(str2chr(command, i))); - if (command != command2) - return; + if (command != command2) return; // if we're banned, don't even parse the command - if(Ban_MaybeEnforceBanOnce(self)) - return; + if (Ban_MaybeEnforceBanOnce(self)) return; float argc = tokenize_console(command); @@ -894,28 +742,27 @@ void SV_ParseClientCommand(string command) // cmd vote - master - login - password // for floodcheck - switch(strtolower(argv(0))) + 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 "mv_getpicture": 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 - case "sentcvar": break; // handled by server in this file - case "spawn": break; // handled by engine in host_cmd.c + case "begin": break; // handled by engine in host_cmd.c + case "download": break; // handled by engine in cl_parse.c + case "mv_getpicture": 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 + case "sentcvar": break; // handled by server in this file + case "spawn": break; // handled by engine in host_cmd.c + case "c2s": Net_ClientCommand(this, command); return; // handled by net.qh default: - if(SV_ParseClientCommand_floodcheck()) - break; // "true": continue, as we're not flooding yet - else - return; // "false": not allowed to continue, halt // print("^1ERROR: ^7ANTISPAM CAUGHT: ", command, ".\n"); + if (SV_ParseClientCommand_floodcheck()) break; // "true": continue, as we're not flooding yet + else return; // "false": not allowed to continue, halt // print("^1ERROR: ^7ANTISPAM CAUGHT: ", command, ".\n"); } /* NOTE: should this be disabled? It can be spammy perhaps, but hopefully it's okay for now */ - if(argv(0) == "help") + if (argv(0) == "help") { - if(argc == 1) + if (argc == 1) { sprint(self, "\nClient networked commands:\n"); ClientCommand_macro_help(); @@ -927,31 +774,33 @@ void SV_ParseClientCommand(string command) sprint(self, "For help about a specific command, type cmd help COMMAND\n"); return; } - else if(CommonCommand_macro_usage(argc, self)) // Instead of trying to call a command, we're going to see detailed information about it + else if (CommonCommand_macro_usage(argc, self)) // Instead of trying to call a command, we're going to see detailed information about it { return; } - else if(ClientCommand_macro_usage(argc)) // same, but for normal commands now + else if (ClientCommand_macro_usage(argc)) // same, but for normal commands now { return; } } - else if(MUTATOR_CALLHOOK(SV_ParseClientCommand, strtolower(argv(0)), argc, command)) + else if (MUTATOR_CALLHOOK(SV_ParseClientCommand, strtolower(argv(0)), argc, command)) { - return; // handled by a mutator + return; // handled by a mutator } - else if(CheatCommand(argc)) + else if (CheatCommand(argc)) { - return; // handled by server/cheats.qc + return; // handled by server/cheats.qc } - else if(CommonCommand_macro_command(argc, self, command)) + else if (CommonCommand_macro_command(argc, self, command)) { - return; // handled by server/command/common.qc + return; // handled by server/command/common.qc } - else if(ClientCommand_macro_command(argc, command)) // continue as usual and scan for normal commands + else if (ClientCommand_macro_command(argc, command)) // continue as usual and scan for normal commands { - return; // handled by one of the above ClientCommand_* functions + return; // handled by one of the above ClientCommand_* functions } else + { clientcommand(self, command); + } }