X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fcmd.qc;h=1395986b97bd3a463ab33c16e8508da381f992ca;hb=6f07b9a66403cc921d651ce87305f02426181051;hp=2314f71033c85bc664366607011b0714761eeb6a;hpb=8dc41732ce8f482ba23e1e2c4f91a734d2297c61;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 2314f7103..66161af24 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -1,46 +1,39 @@ #include "cmd.qh" -#include -#include - #include - -#include "common.qh" -#include "vote.qh" - -#include "../campaign.qh" -#include "../cheats.qh" -#include "../player.qh" -#include "../ipban.qh" -#include "../mapvoting.qh" -#include "../scores.qh" -#include "../teamplay.qh" - -#include "../mutators/_mod.qh" - -#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 - -void ClientKill_TeamChange(entity this, float targetteam); // 0 = don't change, -1 = auto, -2 = spec +#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 @@ -72,7 +65,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) { @@ -80,14 +73,14 @@ void ClientCommand_autoswitch(entity caller, float request, float 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"); @@ -97,7 +90,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) { @@ -118,7 +111,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"); @@ -130,7 +123,7 @@ void ClientCommand_clientversion(entity caller, float request, float argc) // i } 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"); @@ -140,7 +133,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) { @@ -155,7 +148,7 @@ void ClientCommand_mv_getpicture(entity caller, float request, float argc) // i } 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"); @@ -165,18 +158,130 @@ 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) +void ClientCommand_wpeditor(entity caller, int request, int argc) { switch (request) { case CMD_REQUEST_COMMAND: { - if (!game_stopped) - if (IS_CLIENT(caller) && !IS_PLAYER(caller)) - if (joinAllowed(caller)) - Join(caller); + 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, 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, " ^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) + { + case CMD_REQUEST_COMMAND: + { + 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 } @@ -191,7 +296,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) { @@ -213,14 +348,14 @@ 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; } } 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"); @@ -231,7 +366,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) { @@ -239,21 +374,23 @@ void ClientCommand_ready(entity caller, float request) // todo: anti-spam for t { 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; if (caller.ready) // toggle { caller.ready = false; - bprint(playername(caller, false), "^2 is ^1NOT^2 ready\n"); + if(IS_PLAYER(caller) || caller.caplayer == 1) + bprint(playername(caller.netname, caller.team, false), "^2 is ^1NOT^2 ready\n"); } else { caller.ready = true; - bprint(playername(caller, false), "^2 is ready\n"); + 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! @@ -278,7 +415,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) { @@ -298,13 +435,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 } @@ -319,7 +457,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) { @@ -338,7 +476,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; @@ -348,40 +486,11 @@ void ClientCommand_selectteam(entity caller, float request, float 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; @@ -391,18 +500,24 @@ void ClientCommand_selectteam(entity caller, float request, float 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) { - CheckAllowedTeams(caller); - GetTeamCounts(caller); - if ((BIT(Team_TeamToNumber(selection) - 1) & FindBestTeamsForBalance(caller, false)) == 0) + entity balance = TeamBalance_CheckAllowedTeams(caller); + TeamBalance_GetTeamCounts(balance, caller); + if ((Team_IndexToBit(Team_TeamToIndex(team_num)) & + TeamBalance_FindBestTeams(balance, caller, false)) == 0) { Send_Notification(NOTIF_ONE, caller, MSG_INFO, INFO_TEAMCHANGE_LARGERTEAM); + TeamBalance_Destroy(balance); return; } + 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 @@ -410,7 +525,7 @@ void ClientCommand_selectteam(entity caller, float request, float 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"); @@ -421,7 +536,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) { @@ -435,7 +550,7 @@ void ClientCommand_selfstuff(entity caller, float 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"); @@ -445,7 +560,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) { @@ -462,14 +577,14 @@ void ClientCommand_sentcvar(entity caller, float request, float argc, string com 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"); @@ -479,7 +594,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) { @@ -487,15 +602,25 @@ void ClientCommand_spectate(entity caller, float 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); @@ -512,14 +637,14 @@ void ClientCommand_spectate(entity caller, float 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; } } } -void ClientCommand_suggestmap(entity caller, float request, float argc) +void ClientCommand_suggestmap(entity caller, int request, int argc) { switch (request) { @@ -533,7 +658,7 @@ void ClientCommand_suggestmap(entity caller, float request, float 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"); @@ -543,7 +668,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) { @@ -590,7 +715,7 @@ void ClientCommand_tell(entity caller, float request, float 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"); @@ -600,7 +725,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) { @@ -614,15 +739,29 @@ 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, ""); + 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)); + VoiceMessage(caller, e, msg); return; } } 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"); @@ -635,7 +774,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) { @@ -665,8 +804,10 @@ void ClientCommand_(entity caller, float request) #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("clientversion", ClientCommand_clientversion(ent, request, arguments), "Release version of the game") \ - CLIENT_COMMAND("mv_getpicture", ClientCommand_mv_getpicture(ent, request, arguments), "Retrieve mapshot picture from the server") \ 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") \ CLIENT_COMMAND("ready", ClientCommand_ready(ent, request), "Qualify as ready to end warmup stage (or restart server if allowed)") \ CLIENT_COMMAND("say", ClientCommand_say(ent, request, arguments, command), "Print a message to chat to all players") \ @@ -678,7 +819,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("minigame", ClientCommand_minigame(ent, request, arguments, command), "Start a minigame") \ + CLIENT_COMMAND("wpeditor", ClientCommand_wpeditor(ent, request, arguments), "Waypoint editor commands") \ /* nothing */ void ClientCommand_macro_help(entity caller) @@ -690,7 +831,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; } } @@ -701,7 +842,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; } } @@ -739,7 +880,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 @@ -753,10 +894,20 @@ 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": // 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: