X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fcmd.qc;h=6928957d6d812e6f15511d2b82e421d8f0c7f877;hp=9743dc5c4815f56c0ef3212f52e661fe5bdc85d6;hb=dc141acff9b80547084cbb83f52e83a7be95eceb;hpb=03a5b5158f37b12a04ade2f4c1f482c90e53f7a0 diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 9743dc5c48..6928957d6d 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -8,6 +8,8 @@ #include "common.qh" #include "vote.qh" +#include "../bot/api.qh" + #include "../campaign.qh" #include "../cheats.qh" #include "../client.qh" @@ -73,7 +75,7 @@ bool SV_ParseClientCommand_floodcheck(entity this) // Command Sub-Functions // ======================= -void ClientCommand_autoswitch(entity caller, float request, float argc) +void ClientCommand_autoswitch(entity caller, int request, int argc) { switch (request) { @@ -98,7 +100,7 @@ void ClientCommand_autoswitch(entity caller, float request, float argc) } } -void ClientCommand_clientversion(entity caller, float request, float argc) // internal command, used only by code +void ClientCommand_clientversion(entity caller, int request, int argc) // internal command, used only by code { switch (request) { @@ -119,7 +121,7 @@ void ClientCommand_clientversion(entity caller, float request, float argc) // i { // JoinBestTeam(caller, false, true); } - else if (teamplay && !autocvar_sv_spectate && !(caller.team_forced > 0)) + else if (teamplay && !autocvar_sv_spectate && !(Player_GetForcedTeamIndex(caller) > 0)) { TRANSMUTE(Observer, caller); // really? stuffcmd(caller, "menu_showteamselect\n"); @@ -141,7 +143,7 @@ void ClientCommand_clientversion(entity caller, float request, float argc) // i } } -void ClientCommand_mv_getpicture(entity caller, float request, float argc) // internal command, used only by code +void ClientCommand_mv_getpicture(entity caller, int request, int argc) // internal command, used only by code { switch (request) { @@ -166,7 +168,118 @@ void ClientCommand_mv_getpicture(entity caller, float request, float argc) // i } } -void ClientCommand_join(entity caller, float request) +void ClientCommand_wpeditor(entity caller, int request, int argc) +{ + switch (request) + { + case CMD_REQUEST_COMMAND: + { + if (!autocvar_g_waypointeditor) + { + sprint(caller, "ERROR: this command works only if the waypoint editor is on\n"); + return; + } + + if (argv(1) != "") + { + if (argv(1) == "spawn") + { + string s = argv(2); + if (!IS_PLAYER(caller)) + sprint(caller, "ERROR: this command works only if you are player\n"); + else + waypoint_spawn_fromeditor(caller, (s == "crosshair"), (s == "jump"), (s == "crouch"), (s == "support")); + return; + } + else if (argv(1) == "remove") + { + if (!IS_PLAYER(caller)) + sprint(caller, "ERROR: this command works only if you are player\n"); + else + waypoint_remove_fromeditor(caller); + return; + } + else if (argv(1) == "hardwire") + { + string s = argv(2); + waypoint_start_hardwiredlink(caller, (s == "crosshair")); + return; + } + else if (argv(1) == "lock") + { + waypoint_lock(caller); + return; + } + else if (argv(1) == "unreachable") + { + if (!IS_PLAYER(caller)) + sprint(caller, "ERROR: this command works only if you are player\n"); + else + waypoint_unreachable(caller); + return; + } + else if (argv(1) == "saveall") + { + waypoint_saveall(); + return; + } + else if (argv(1) == "relinkall") + { + waypoint_schedulerelinkall(); + return; + } + else if (argv(1) == "symaxis") + { + if (argv(2) == "set" || argv(2) == "get") + { + waypoint_getSymmetricalAxis_cmd(caller, (argv(2) == "set"), 3); + return; + } + } + else if (argv(1) == "symorigin") + { + if (argv(2) == "set" || argv(2) == "get") + { + waypoint_getSymmetricalOrigin_cmd(caller, (argv(2) == "set"), 3); + return; + } + } + } + } + + default: + sprint(caller, "Incorrect parameters for ^2wpeditor^7\n"); + 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, " ^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, " ^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" + " 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"); + return; + } + } +} + +void ClientCommand_join(entity caller, int request) { switch (request) { @@ -190,7 +303,37 @@ void ClientCommand_join(entity caller, float request) } } -void ClientCommand_physics(entity caller, float request, float argc) +void ClientCommand_kill(entity caller, int request) +{ + switch (request) + { + case CMD_REQUEST_COMMAND: + { + if(IS_SPEC(caller) || IS_OBSERVER(caller)) + return; // no point warning about this, command does nothing + + if(GetResource(caller, RES_HEALTH) <= 0) + { + sprint(caller, "Can't die - you are already dead!\n"); + return; + } + + ClientKill(caller); + + return; // never fall through to usage + } + + default: + case CMD_REQUEST_USAGE: + { + sprint(caller, "\nUsage:^3 cmd kill\n"); + sprint(caller, " No arguments required.\n"); + return; + } + } +} + +void ClientCommand_physics(entity caller, int request, int argc) { switch (request) { @@ -212,7 +355,7 @@ void ClientCommand_physics(entity caller, float request, float argc) if (Physics_Valid(command) || command == "default") { - stuffcmd(caller, strcat("\nseta cl_physics ", command, "\nsendcvar cl_physics\n")); + stuffcmd(caller, strcat("\nseta cl_physics ", command, "\n")); sprint(caller, strcat("^2Physics set successfully changed to ^3", command, "\n")); return; } @@ -230,7 +373,7 @@ void ClientCommand_physics(entity caller, float request, float argc) } } -void ClientCommand_ready(entity caller, float request) // todo: anti-spam for toggling readyness +void ClientCommand_ready(entity caller, int request) // todo: anti-spam for toggling readyness { switch (request) { @@ -279,7 +422,7 @@ void ClientCommand_ready(entity caller, float request) // todo: anti-spam for t } } -void ClientCommand_say(entity caller, float request, float argc, string command) +void ClientCommand_say(entity caller, int request, int argc, string command) { switch (request) { @@ -299,13 +442,14 @@ void ClientCommand_say(entity caller, float request, float argc, string command) } } -void ClientCommand_say_team(entity caller, float request, float argc, string command) +void ClientCommand_say_team(entity caller, int request, int argc, string command) { switch (request) { case CMD_REQUEST_COMMAND: { - if (argc >= 2) Say(caller, true, NULL, 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 } @@ -320,7 +464,7 @@ void ClientCommand_say_team(entity caller, float request, float argc, string com } .bool team_selected; -void ClientCommand_selectteam(entity caller, float request, float argc) +void ClientCommand_selectteam(entity caller, int request, int argc) { switch (request) { @@ -339,7 +483,7 @@ void ClientCommand_selectteam(entity caller, float request, float argc) sprint(caller, "^7selectteam can only be used in teamgames\n"); return; } - if (caller.team_forced > 0) + if (Player_GetForcedTeamIndex(caller) > 0) { sprint(caller, "^7selectteam can not be used as your team is forced\n"); return; @@ -425,7 +569,7 @@ void ClientCommand_selectteam(entity caller, float request, float argc) } } -void ClientCommand_selfstuff(entity caller, float request, string command) +void ClientCommand_selfstuff(entity caller, int request, string command) { switch (request) { @@ -449,7 +593,7 @@ void ClientCommand_selfstuff(entity caller, float request, string command) } } -void ClientCommand_sentcvar(entity caller, float request, float argc, string command) +void ClientCommand_sentcvar(entity caller, int request, int argc, string command) { switch (request) { @@ -483,7 +627,7 @@ void ClientCommand_sentcvar(entity caller, float request, float argc, string com } } -void ClientCommand_spectate(entity caller, float request) +void ClientCommand_spectate(entity caller, int request) { switch (request) { @@ -523,7 +667,7 @@ void ClientCommand_spectate(entity caller, float request) } } -void ClientCommand_suggestmap(entity caller, float request, float argc) +void ClientCommand_suggestmap(entity caller, int request, int argc) { switch (request) { @@ -547,7 +691,7 @@ void ClientCommand_suggestmap(entity caller, float request, float argc) } } -void ClientCommand_tell(entity caller, float request, float argc, string command) +void ClientCommand_tell(entity caller, int request, int argc, string command) { switch (request) { @@ -604,7 +748,7 @@ void ClientCommand_tell(entity caller, float request, float argc, string command } } -void ClientCommand_voice(entity caller, float request, float argc, string command) +void ClientCommand_voice(entity caller, int request, int argc, string command) { switch (request) { @@ -618,6 +762,18 @@ void ClientCommand_voice(entity caller, float request, float argc, string comman sprint(caller, sprintf("Invalid voice. Use one of: %s\n", allvoicesamples)); return; } + if (IS_DEAD(caller)) + { + // don't warn the caller when trying to taunt while dead, just don't play any sounds! + // we still allow them to see warnings if it's invalid, so a dead player can find out the sounds in peace + return; + } + if (IS_SPEC(caller) || IS_OBSERVER(caller)) + { + // observers/spectators have no player model of their own to play taunts from + // again, allow them to see warnings + return; + } string msg = ""; if (argc >= 3) msg = substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2)); @@ -641,7 +797,7 @@ void ClientCommand_voice(entity caller, float request, float argc, string comman /* 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_(entity caller, float request) +void ClientCommand_(entity caller, int request) { switch(request) { @@ -672,6 +828,7 @@ void ClientCommand_(entity caller, float request) CLIENT_COMMAND("autoswitch", ClientCommand_autoswitch(ent, request, arguments), "Whether or not to switch automatically when getting a better weapon") \ CLIENT_COMMAND("clientversion", ClientCommand_clientversion(ent, request, arguments), "Release version of the game") \ 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") \ CLIENT_COMMAND("mv_getpicture", ClientCommand_mv_getpicture(ent, request, arguments), "Retrieve mapshot picture from the server") \ CLIENT_COMMAND("physics", ClientCommand_physics(ent, request, arguments), "Change physics set") \ @@ -685,6 +842,7 @@ void ClientCommand_(entity caller, float request) 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("wpeditor", ClientCommand_wpeditor(ent, request, arguments), "Waypoint editor commands") \ /* nothing */ void ClientCommand_macro_help(entity caller) @@ -696,7 +854,7 @@ void ClientCommand_macro_help(entity caller) #undef CLIENT_COMMAND } -float ClientCommand_macro_command(float argc, entity caller, string command) +float ClientCommand_macro_command(int argc, entity caller, string command) { #define CLIENT_COMMAND(name, function, description) \ { if (name == strtolower(argv(0))) { function; return true; } } @@ -707,7 +865,7 @@ float ClientCommand_macro_command(float argc, entity caller, string command) return false; } -float ClientCommand_macro_usage(float argc, entity caller) +float ClientCommand_macro_usage(int argc, entity caller) { #define CLIENT_COMMAND(name, function, description) \ { if (name == strtolower(argv(1))) { function; return true; } } @@ -745,7 +903,7 @@ void SV_ParseClientCommand(entity this, string command) // if we're banned, don't even parse the command if (Ban_MaybeEnforceBanOnce(this)) return; - float argc = tokenize_console(command); + int argc = tokenize_console(command); // Guide for working with argc arguments by example: // argc: 1 - 2 - 3 - 4 @@ -759,10 +917,12 @@ void SV_ParseClientCommand(entity this, string command) 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 "wpeditor": 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 "color": case "topcolor": case "bottomcolor": if(teamplay) return; else break; // handled by engine in host_cmd.c case "c2s": Net_ClientCommand(this, command); return; // handled by net.qh default: