X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fsv_cmd.qc;h=4c0445f1d33a99c3313dc01eca27b44a7f25dd0f;hb=fbb96108e5828a7557694db4469c2d0d7c582846;hp=8f3ea869d49e24bcdf0febd74dc5564c1002f7b6;hpb=582d4772020ad581b8a76d372dd9f5f1ed8a756f;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index 8f3ea869d..43c53792e 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -1,3 +1,40 @@ +#include "../../common/command/command.qh" +#include "sv_cmd.qh" +#include "../_all.qh" + +#include "banning.qh" +#include "cmd.qh" +#include "common.qh" +#include "getreplies.qh" +#include "radarmap.qh" + +#include "../anticheat.qh" +#include "../campaign.qh" +#include "../cl_client.qh" +#include "../cl_player.qh" +#include "../g_world.qh" +#include "../ipban.qh" +#include "../playerdemo.qh" +#include "../teamplay.qh" + +#include "../bot/bot.qh" +#include "../bot/navigation.qh" +#include "../bot/scripting.qh" + +#include "../mutators/mutators_include.qh" + +#include "../../common/constants.qh" +#include "../../common/mapinfo.qh" +#include "../../common/notifications.qh" +#include "../../common/teams.qh" +#include "../../common/util.qh" + +#include "../../common/monsters/sv_monsters.qh" + +#include "../../warpzonelib/mathlib.qh" + +void PutObserverInServer (void); + // ===================================================== // Server side game commands code, reworked by Samual // Last updated: December 29th, 2011 @@ -23,7 +60,7 @@ void make_mapinfo_Think() void changematchtime(float delta, float mi, float ma) { float cur; - float new; + float update; float lim; if(delta == 0) @@ -44,21 +81,21 @@ void changematchtime(float delta, float mi, float ma) if(lim == 0) return; // cannot increase any further else if(lim < ma) - new = min(ma, lim + delta); + update = min(ma, lim + delta); else // already above maximum: FAIL return; } else { if(lim == 0) // infinite: try reducing to max, if we are allowed to - new = max(mi, ma); + update = max(mi, ma); else if(lim > mi) // above minimum: decrease - new = max(mi, lim + delta); + update = max(mi, lim + delta); else // already below minimum: FAIL return; } - cvar_set("timelimit", ftos(new / 60)); + cvar_set("timelimit", ftos(update / 60)); } @@ -74,31 +111,31 @@ void GameCommand_adminmsg(float request, float argc) { entity client; float accepted; - + string targets = strreplace(",", " ", argv(1)); string original_targets = strreplace(" ", ", ", targets); string admin_message = argv(2); float infobartime = stof(argv(3)); - + string successful, t; successful = string_null; - + if((targets) && (admin_message)) { - for(;targets;) + for (;targets;) { t = car(targets); targets = cdr(targets); - + // Check to see if the player is a valid target client = GetFilteredEntity(t); - accepted = VerifyClientEntity(client, TRUE, FALSE); - - if not(accepted > 0) + accepted = VerifyClientEntity(client, true, false); + + if(accepted <= 0) { - print("adminmsg: ", GetClientErrorString(accepted, t), (targets ? ", skipping to next player.\n" : ".\n")); + print("adminmsg: ", GetClientErrorString(accepted, t), (targets ? ", skipping to next player.\n" : ".\n")); continue; } - + // send the centerprint/console print or infomessage if(infobartime) { @@ -109,21 +146,21 @@ void GameCommand_adminmsg(float request, float argc) centerprint(client, strcat("^3", admin_name(), ":\n^7", admin_message)); sprint(client, strcat("\{1}\{13}^3", admin_name(), "^7: ", admin_message, "\n")); } - + successful = strcat(successful, (successful ? ", " : ""), client.netname); dprint("Message sent to ", client.netname, "\n"); continue; } - + if(successful) bprint("Successfully sent message '", admin_message, "' to ", successful, ".\n"); else print("No players given (", original_targets, ") could receive the message.\n"); - + return; } } - + default: print("Incorrect parameters for ^2adminmsg^7\n"); case CMD_REQUEST_USAGE: @@ -139,6 +176,47 @@ void GameCommand_adminmsg(float request, float argc) } } +void GameCommand_mobbutcher(float request) +{ + switch(request) + { + case CMD_REQUEST_COMMAND: + { + if(autocvar_g_campaign) { print("This command doesn't work in campaign mode.\n"); return; } + if(g_invasion) { print("This command doesn't work during an invasion.\n"); return; } + + float removed_count = 0; + entity head; + + FOR_EACH_MONSTER(head) + { + monster_remove(head); + ++removed_count; + } + + monsters_total = 0; // reset stats? + monsters_killed = 0; + + totalspawned = 0; + + if(removed_count <= 0) + print("No monsters to kill\n"); + else + printf("Killed %d monster%s\n", removed_count, ((removed_count == 1) ? "" : "s")); + + return; // never fall through to usage + } + + default: + case CMD_REQUEST_USAGE: + { + print("\nUsage:^3 sv_cmd mobbutcher\n"); + print(" No arguments required.\n"); + return; + } + } +} + void GameCommand_allready(float request) { switch(request) @@ -148,7 +226,7 @@ void GameCommand_allready(float request) ReadyRestart(); return; } - + default: case CMD_REQUEST_USAGE: { @@ -160,7 +238,7 @@ void GameCommand_allready(float request) } void GameCommand_allspec(float request, float argc) -{ +{ switch(request) { case CMD_REQUEST_COMMAND: @@ -168,10 +246,12 @@ void GameCommand_allspec(float request, float argc) entity client; string reason = argv(1); float i = 0; - + FOR_EACH_REALPLAYER(client) { self = client; + if(self.caplayer) + self.caplayer = 0; PutObserverInServer(); ++i; } @@ -179,7 +259,7 @@ void GameCommand_allspec(float request, float argc) else { print("No players found to spectate.\n"); } return; } - + default: case CMD_REQUEST_USAGE: { @@ -191,16 +271,16 @@ void GameCommand_allspec(float request, float argc) } } -void GameCommand_anticheat(float request, float argc) +void GameCommand_anticheat(float request, float argc) { switch(request) { case CMD_REQUEST_COMMAND: { entity client = GetIndexedEntity(argc, 1); - float accepted = VerifyClientEntity(client, FALSE, FALSE); - - if(accepted > 0) + float accepted = VerifyClientEntity(client, false, false); + + if(accepted > 0) { self = client; anticheat_report(); @@ -208,10 +288,10 @@ void GameCommand_anticheat(float request, float argc) } else { - print("anticheat: ", GetClientErrorString(accepted, argv(1)), ".\n"); + print("anticheat: ", GetClientErrorString(accepted, argv(1)), ".\n"); } } - + default: print("Incorrect parameters for ^2anticheat^7\n"); case CMD_REQUEST_USAGE: @@ -223,88 +303,88 @@ void GameCommand_anticheat(float request, float argc) } } -void GameCommand_bbox(float request) +void GameCommand_bbox(float request) { switch(request) { case CMD_REQUEST_COMMAND: { - print("Original size: ", ftos(world.absmin_x), " ", ftos(world.absmin_y), " ", ftos(world.absmin_z)); - print(" ", ftos(world.absmax_x), " ", ftos(world.absmax_y), " ", ftos(world.absmax_z), "\n"); - print("Currently set size: ", ftos(world.mins_x), " ", ftos(world.mins_y), " ", ftos(world.mins_z)); - print(" ", ftos(world.maxs_x), " ", ftos(world.maxs_y), " ", ftos(world.maxs_z), "\n"); + print("Original size: ", ftos(world.absmin.x), " ", ftos(world.absmin.y), " ", ftos(world.absmin.z)); + print(" ", ftos(world.absmax.x), " ", ftos(world.absmax.y), " ", ftos(world.absmax.z), "\n"); + print("Currently set size: ", ftos(world.mins.x), " ", ftos(world.mins.y), " ", ftos(world.mins.z)); + print(" ", ftos(world.maxs.x), " ", ftos(world.maxs.y), " ", ftos(world.maxs.z), "\n"); print("Solid bounding box size:"); - tracebox('1 0 0' * world.absmin_x, - '0 1 0' * world.absmin_y + '0 0 1' * world.absmin_z, - '0 1 0' * world.absmax_y + '0 0 1' * world.absmax_z, - '1 0 0' * world.absmax_x, + tracebox('1 0 0' * world.absmin.x, + '0 1 0' * world.absmin.y + '0 0 1' * world.absmin.z, + '0 1 0' * world.absmax.y + '0 0 1' * world.absmax.z, + '1 0 0' * world.absmax.x, MOVE_WORLDONLY, world); if(trace_startsolid) - print(" ", ftos(world.absmin_x)); + print(" ", ftos(world.absmin.x)); else - print(" ", ftos(trace_endpos_x)); + print(" ", ftos(trace_endpos.x)); - tracebox('0 1 0' * world.absmin_y, - '1 0 0' * world.absmin_x + '0 0 1' * world.absmin_z, - '1 0 0' * world.absmax_x + '0 0 1' * world.absmax_z, - '0 1 0' * world.absmax_y, + tracebox('0 1 0' * world.absmin.y, + '1 0 0' * world.absmin.x + '0 0 1' * world.absmin.z, + '1 0 0' * world.absmax.x + '0 0 1' * world.absmax.z, + '0 1 0' * world.absmax.y, MOVE_WORLDONLY, world); if(trace_startsolid) - print(" ", ftos(world.absmin_y)); + print(" ", ftos(world.absmin.y)); else - print(" ", ftos(trace_endpos_y)); + print(" ", ftos(trace_endpos.y)); - tracebox('0 0 1' * world.absmin_z, - '1 0 0' * world.absmin_x + '0 1 0' * world.absmin_y, - '1 0 0' * world.absmax_x + '0 1 0' * world.absmax_y, - '0 0 1' * world.absmax_z, + tracebox('0 0 1' * world.absmin.z, + '1 0 0' * world.absmin.x + '0 1 0' * world.absmin.y, + '1 0 0' * world.absmax.x + '0 1 0' * world.absmax.y, + '0 0 1' * world.absmax.z, MOVE_WORLDONLY, world); if(trace_startsolid) - print(" ", ftos(world.absmin_z)); + print(" ", ftos(world.absmin.z)); else - print(" ", ftos(trace_endpos_z)); + print(" ", ftos(trace_endpos.z)); - tracebox('1 0 0' * world.absmax_x, - '0 1 0' * world.absmin_y + '0 0 1' * world.absmin_z, - '0 1 0' * world.absmax_y + '0 0 1' * world.absmax_z, - '1 0 0' * world.absmin_x, + tracebox('1 0 0' * world.absmax.x, + '0 1 0' * world.absmin.y + '0 0 1' * world.absmin.z, + '0 1 0' * world.absmax.y + '0 0 1' * world.absmax.z, + '1 0 0' * world.absmin.x, MOVE_WORLDONLY, world); if(trace_startsolid) - print(" ", ftos(world.absmax_x)); + print(" ", ftos(world.absmax.x)); else - print(" ", ftos(trace_endpos_x)); + print(" ", ftos(trace_endpos.x)); - tracebox('0 1 0' * world.absmax_y, - '1 0 0' * world.absmin_x + '0 0 1' * world.absmin_z, - '1 0 0' * world.absmax_x + '0 0 1' * world.absmax_z, - '0 1 0' * world.absmin_y, + tracebox('0 1 0' * world.absmax.y, + '1 0 0' * world.absmin.x + '0 0 1' * world.absmin.z, + '1 0 0' * world.absmax.x + '0 0 1' * world.absmax.z, + '0 1 0' * world.absmin.y, MOVE_WORLDONLY, world); if(trace_startsolid) - print(" ", ftos(world.absmax_y)); + print(" ", ftos(world.absmax.y)); else - print(" ", ftos(trace_endpos_y)); + print(" ", ftos(trace_endpos.y)); - tracebox('0 0 1' * world.absmax_z, - '1 0 0' * world.absmin_x + '0 1 0' * world.absmin_y, - '1 0 0' * world.absmax_x + '0 1 0' * world.absmax_y, - '0 0 1' * world.absmin_z, + tracebox('0 0 1' * world.absmax.z, + '1 0 0' * world.absmin.x + '0 1 0' * world.absmin.y, + '1 0 0' * world.absmax.x + '0 1 0' * world.absmax.y, + '0 0 1' * world.absmin.z, MOVE_WORLDONLY, world); if(trace_startsolid) - print(" ", ftos(world.absmax_z)); + print(" ", ftos(world.absmax.z)); else - print(" ", ftos(trace_endpos_z)); - + print(" ", ftos(trace_endpos.z)); + print("\n"); return; } - + default: case CMD_REQUEST_USAGE: { @@ -323,7 +403,7 @@ void GameCommand_bot_cmd(float request, float argc, string command) case CMD_REQUEST_COMMAND: { entity bot; - + if(argv(1) == "reset") { bot_resetqueues(); @@ -414,7 +494,7 @@ void GameCommand_bot_cmd(float request, float argc, string command) print(strcat("Error: Can't find bot with the name or id '", argv(1),"' - Did you mistype the command?\n")); // don't return so that usage is shown } } - + default: print("Incorrect parameters for ^2bot_cmd^7\n"); case CMD_REQUEST_USAGE: @@ -435,17 +515,14 @@ void GameCommand_cointoss(float request, float argc) { case CMD_REQUEST_COMMAND: { - entity client; - string result1 = (argv(2) ? strcat("^7", argv(1), "^3!\n") : "^1HEADS^3!\n"); - string result2 = (argv(2) ? strcat("^7", argv(2), "^3!\n") : "^4TAILS^3!\n"); + string result1 = (argv(2) ? strcat("^7", argv(1)) : "^1HEADS"); + string result2 = (argv(2) ? strcat("^7", argv(2)) : "^4TAILS"); string choice = ((random() > 0.5) ? result1 : result2); - - FOR_EACH_CLIENT(client) - centerprint(client, strcat("^3Throwing coin... Result: ", choice)); - bprint(strcat("^3Throwing coin... Result: ", choice)); + + Send_Notification(NOTIF_ALL, world, MSG_MULTI, MULTI_COINTOSS, choice); return; } - + default: case CMD_REQUEST_USAGE: { @@ -456,7 +533,7 @@ void GameCommand_cointoss(float request, float argc) } } -void GameCommand_database(float request, float argc) +void GameCommand_database(float request, float argc) { switch(request) { @@ -485,7 +562,7 @@ void GameCommand_database(float request, float argc) } } } - + default: print("Incorrect parameters for ^2database^7\n"); case CMD_REQUEST_USAGE: @@ -500,30 +577,30 @@ void GameCommand_database(float request, float argc) } void GameCommand_defer_clear(float request, float argc) -{ +{ switch(request) { case CMD_REQUEST_COMMAND: { entity client; float accepted; - + if(argc >= 2) { client = GetIndexedEntity(argc, 1); - accepted = VerifyClientEntity(client, TRUE, FALSE); - + accepted = VerifyClientEntity(client, true, false); + if(accepted > 0) { stuffcmd(client, "defer clear\n"); print("defer clear stuffed to ", client.netname, "\n"); } else { print("defer_clear: ", GetClientErrorString(accepted, argv(1)), ".\n"); } - + return; } } - + default: print("Incorrect parameters for ^2defer_clear^7\n"); case CMD_REQUEST_USAGE: @@ -537,7 +614,7 @@ void GameCommand_defer_clear(float request, float argc) } void GameCommand_defer_clear_all(float request) -{ +{ switch(request) { case CMD_REQUEST_COMMAND: @@ -545,17 +622,17 @@ void GameCommand_defer_clear_all(float request) entity client; float i = 0; float argc; - + FOR_EACH_CLIENT(client) { argc = tokenize_console(strcat("defer_clear ", ftos(num_for_edict(client)))); - GameCommand_defer_clear(CMD_REQUEST_COMMAND, argc); + GameCommand_defer_clear(CMD_REQUEST_COMMAND, argc); ++i; } - if(i) { print(strcat("Successfully stuffed defer clear to all clients (", ftos(i), ")\n")); } // should a message be added if no players were found? + if(i) { print(strcat("Successfully stuffed defer clear to all clients (", ftos(i), ")\n")); } // should a message be added if no players were found? return; } - + default: case CMD_REQUEST_USAGE: { @@ -581,8 +658,8 @@ void GameCommand_delrec(float request, float argc) // perhaps merge later with race_deleteTime(GetMapname(), stof(argv(1))); return; } - } - + } + default: print("Incorrect parameters for ^2delrec^7\n"); case CMD_REQUEST_USAGE: @@ -596,7 +673,7 @@ void GameCommand_delrec(float request, float argc) // perhaps merge later with } } -void GameCommand_effectindexdump(float request) +void GameCommand_effectindexdump(float request) { switch(request) { @@ -604,7 +681,7 @@ void GameCommand_effectindexdump(float request) { float fh, d; string s; - + d = db_create(); print("begin of effects list\n"); db_put(d, "TE_GUNSHOT", "1"); print("effect TE_GUNSHOT is ", ftos(particleeffectnum("TE_GUNSHOT")), "\n"); @@ -663,7 +740,7 @@ void GameCommand_effectindexdump(float request) db_close(d); return; } - + default: case CMD_REQUEST_USAGE: { @@ -674,7 +751,7 @@ void GameCommand_effectindexdump(float request) } } -void GameCommand_extendmatchtime(float request) +void GameCommand_extendmatchtime(float request) { switch(request) { @@ -683,7 +760,7 @@ void GameCommand_extendmatchtime(float request) changematchtime(autocvar_timelimit_increment * 60, autocvar_timelimit_min * 60, autocvar_timelimit_max * 60); return; } - + default: case CMD_REQUEST_USAGE: { @@ -696,19 +773,19 @@ void GameCommand_extendmatchtime(float request) } void GameCommand_find(float request, float argc) // is this even needed? We have prvm_edicts command and such ANYWAY -{ +{ switch(request) { case CMD_REQUEST_COMMAND: { entity client; - + for(client = world; (client = find(client, classname, argv(1))); ) print(etos(client), "\n"); - + return; } - + default: print("Incorrect parameters for ^2find^7\n"); case CMD_REQUEST_USAGE: @@ -720,8 +797,8 @@ void GameCommand_find(float request, float argc) // is this even needed? We hav } } -void GameCommand_gametype(float request, float argc) -{ +void GameCommand_gametype(float request, float argc) +{ switch(request) { case CMD_REQUEST_COMMAND: @@ -730,13 +807,18 @@ void GameCommand_gametype(float request, float argc) { string s = argv(1); float t = MapInfo_Type_FromString(s), tsave = MapInfo_CurrentGametype(); - + if(t) { MapInfo_SwitchGameType(t); MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0); if(MapInfo_count > 0) + { + // update lsmaps in case the gametype changed, this way people can easily list maps for it + if(lsmaps_reply != "") { strunzone(lsmaps_reply); } + lsmaps_reply = strzone(getlsmaps()); bprint("Game type successfully switched to ", s, "\n"); + } else { bprint("Cannot use this game type: no map for it found\n"); @@ -746,11 +828,11 @@ void GameCommand_gametype(float request, float argc) } else bprint("Game type switch to ", s, " failed: this type does not exist!\n"); - + return; } } - + default: print("Incorrect parameters for ^2gametype^7\n"); case CMD_REQUEST_USAGE: @@ -763,8 +845,8 @@ void GameCommand_gametype(float request, float argc) } } -void GameCommand_gettaginfo(float request, float argc) -{ +void GameCommand_gettaginfo(float request, float argc) +{ switch(request) { case CMD_REQUEST_COMMAND: @@ -772,7 +854,7 @@ void GameCommand_gettaginfo(float request, float argc) entity tmp_entity; float i; vector v; - + if(argc >= 4) { tmp_entity = spawn(); @@ -793,25 +875,25 @@ void GameCommand_gettaginfo(float request, float argc) v = gettaginfo(tmp_entity, i); print("model ", tmp_entity.model, " frame ", ftos(tmp_entity.frame), " tag ", gettaginfo_name); print(" index ", ftos(i), " parent ", ftos(gettaginfo_parent), "\n"); - print(" vector = ", ftos(v_x), " ", ftos(v_y), " ", ftos(v_z), "\n"); - print(" offset = ", ftos(gettaginfo_offset_x), " ", ftos(gettaginfo_offset_y), " ", ftos(gettaginfo_offset_z), "\n"); - print(" forward = ", ftos(gettaginfo_forward_x), " ", ftos(gettaginfo_forward_y), " ", ftos(gettaginfo_forward_z), "\n"); - print(" right = ", ftos(gettaginfo_right_x), " ", ftos(gettaginfo_right_y), " ", ftos(gettaginfo_right_z), "\n"); - print(" up = ", ftos(gettaginfo_up_x), " ", ftos(gettaginfo_up_y), " ", ftos(gettaginfo_up_z), "\n"); + print(" vector = ", ftos(v.x), " ", ftos(v.y), " ", ftos(v.z), "\n"); + print(" offset = ", ftos(gettaginfo_offset.x), " ", ftos(gettaginfo_offset.y), " ", ftos(gettaginfo_offset.z), "\n"); + print(" forward = ", ftos(gettaginfo_forward.x), " ", ftos(gettaginfo_forward.y), " ", ftos(gettaginfo_forward.z), "\n"); + print(" right = ", ftos(gettaginfo_right.x), " ", ftos(gettaginfo_right.y), " ", ftos(gettaginfo_right.z), "\n"); + print(" up = ", ftos(gettaginfo_up.x), " ", ftos(gettaginfo_up.y), " ", ftos(gettaginfo_up.z), "\n"); if(argc >= 6) { - v_y = -v_y; + v.y = -v.y; localcmd(strcat(argv(4), vtos(v), argv(5), "\n")); } } else print("bone not found\n"); - + remove(tmp_entity); return; } } - + default: print("Incorrect parameters for ^2gettaginfo^7\n"); case CMD_REQUEST_USAGE: @@ -823,7 +905,7 @@ void GameCommand_gettaginfo(float request, float argc) } } -void GameCommand_animbench(float request, float argc) +void GameCommand_animbench(float request, float argc) { switch(request) { @@ -891,7 +973,7 @@ void GameCommand_gotomap(float request, float argc) return; } } - + default: print("Incorrect parameters for ^2gotomap^7\n"); case CMD_REQUEST_USAGE: @@ -921,7 +1003,7 @@ void GameCommand_lockteams(float request) } return; } - + default: case CMD_REQUEST_USAGE: { @@ -933,14 +1015,14 @@ void GameCommand_lockteams(float request) } } -void GameCommand_make_mapinfo(float request) +void GameCommand_make_mapinfo(float request) { switch(request) { case CMD_REQUEST_COMMAND: - { + { entity tmp_entity; - + tmp_entity = spawn(); tmp_entity.classname = "make_mapinfo"; tmp_entity.think = make_mapinfo_Think; @@ -948,7 +1030,7 @@ void GameCommand_make_mapinfo(float request) MapInfo_Enumerate(); return; } - + default: case CMD_REQUEST_USAGE: { @@ -968,40 +1050,41 @@ void GameCommand_moveplayer(float request, float argc) { float accepted; entity client; - + string targets = strreplace(",", " ", argv(1)); string original_targets = strreplace(" ", ", ", targets); string destination = argv(2); - string notify = argv(3); - + string successful, t; successful = string_null; - + // lets see if the target(s) even actually exist. if((targets) && (destination)) - { - for(;targets;) + { + for (;targets;) { t = car(targets); targets = cdr(targets); // Check to see if the player is a valid target client = GetFilteredEntity(t); - accepted = VerifyClientEntity(client, FALSE, FALSE); - - if not(accepted > 0) + accepted = VerifyClientEntity(client, false, false); + + if(accepted <= 0) { - print("moveplayer: ", GetClientErrorString(accepted, t), (targets ? ", skipping to next player.\n" : ".\n")); + print("moveplayer: ", GetClientErrorString(accepted, t), (targets ? ", skipping to next player.\n" : ".\n")); continue; } - + // Where are we putting this player? - if(destination == "spec" || destination == "spectator") + if(destination == "spec" || destination == "spectator") { - if(client.classname != "spectator" && client.classname != "observer") + if(!IS_SPEC(client) && !IS_OBSERVER(client)) { self = client; + if(self.caplayer) + self.caplayer = 0; PutObserverInServer(); - + successful = strcat(successful, (successful ? ", " : ""), client.netname); } else @@ -1012,49 +1095,50 @@ void GameCommand_moveplayer(float request, float argc) } else { - if(client.classname != "spectator" && client.classname != "observer") + if(!IS_SPEC(client) && !IS_OBSERVER(client)) { if(teamplay) { // set up - float team_color; + float team_id; float save = client.team_forced; client.team_forced = 0; // find the team to move the player to - team_color = ColourToNumber(destination); - if(team_color == client.team) // already on the destination team + team_id = Team_ColorToTeam(destination); + if(team_id == client.team) // already on the destination team { // keep the forcing undone - print("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") is already on the ", ColoredTeamName(client.team), (targets ? ", skipping to next player.\n" : ".\n")); + print("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") is already on the ", Team_ColoredFullName(client.team), (targets ? "^7, skipping to next player.\n" : "^7.\n")); continue; - } - else if(team_color == 0) // auto team + } + else if(team_id == 0) // auto team { - team_color = NumberToTeamNumber(FindSmallestTeam(client, FALSE)); + CheckAllowedTeams(client); + team_id = Team_NumberToTeam(FindSmallestTeam(client, false)); } else { CheckAllowedTeams(client); } client.team_forced = save; - + // Check to see if the destination team is even available - switch(team_color) + switch(team_id) { - case COLOR_TEAM1: if(c1 == -1) { print("Sorry, can't move player to red team if it doesn't exist.\n"); return; } break; - case COLOR_TEAM2: if(c2 == -1) { print("Sorry, can't move player to blue team if it doesn't exist.\n"); return; } break; - case COLOR_TEAM3: if(c3 == -1) { print("Sorry, can't move player to yellow team if it doesn't exist.\n"); return; } break; - case COLOR_TEAM4: if(c4 == -1) { print("Sorry, can't move player to pink team if it doesn't exist.\n"); return; } break; - + case NUM_TEAM_1: if(c1 == -1) { print("Sorry, can't move player to red team if it doesn't exist.\n"); return; } break; + case NUM_TEAM_2: if(c2 == -1) { print("Sorry, can't move player to blue team if it doesn't exist.\n"); return; } break; + case NUM_TEAM_3: if(c3 == -1) { print("Sorry, can't move player to yellow team if it doesn't exist.\n"); return; } break; + case NUM_TEAM_4: if(c4 == -1) { print("Sorry, can't move player to pink team if it doesn't exist.\n"); return; } break; + default: print("Sorry, can't move player here if team ", destination, " doesn't exist.\n"); return; } - + // If so, lets continue and finally move the player client.team_forced = 0; - MoveToTeam(client, team_color, 6, stof(notify)); + MoveToTeam(client, team_id, 6); successful = strcat(successful, (successful ? ", " : ""), client.netname); - print("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") has been moved to the ", ColoredTeamName(team_color), ".\n"); + print("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") has been moved to the ", Team_ColoredFullName(team_id), "^7.\n"); continue; } else @@ -1065,32 +1149,29 @@ void GameCommand_moveplayer(float request, float argc) } else { - print("Can't change teams if the player isn't in the game.\n"); // well technically we could, but should we allow that? :P + print("Can't change teams if the player isn't in the game.\n"); // well technically we could, but should we allow that? :P return; } } } - + if(successful) bprint("Successfully moved players ", successful, " to destination ", destination, ".\n"); else print("No players given (", original_targets, ") are able to move.\n"); - + return; // still correct parameters so return to avoid usage print } } - + default: print("Incorrect parameters for ^2moveplayer^7\n"); case CMD_REQUEST_USAGE: { - print("\nUsage:^3 sv_cmd moveplayer clients destination [notify]\n"); + print("\nUsage:^3 sv_cmd moveplayer clients destination\n"); print(" 'clients' is a list (separated by commas) of player entity ID's or nicknames\n"); print(" 'destination' is what to send the player to, be it team or spectating\n"); print(" Full list of destinations here: \"spec, spectator, red, blue, yellow, pink, auto.\"\n"); - print(" 'notify' is whether or not to send messages notifying of the move. Detail below.\n"); - print(" 0 (00) automove centerprint, admin message; 1 (01) automove centerprint, no admin message\n"); - print(" 2 (10) no centerprint, admin message; 3 (11) no centerprint, no admin message\n"); print("Examples: sv_cmd moveplayer 1,3,5 red 3\n"); print(" sv_cmd moveplayer 2 spec \n"); print("See also: ^2allspec, shuffleteams^7\n"); @@ -1099,7 +1180,7 @@ void GameCommand_moveplayer(float request, float argc) } } -void GameCommand_nospectators(float request) +void GameCommand_nospectators(float request) { switch(request) { @@ -1107,18 +1188,19 @@ void GameCommand_nospectators(float request) { blockSpectators = 1; entity plr; - FOR_EACH_CLIENT(plr) //give every spectator seconds time to become a player + FOR_EACH_REALCLIENT(plr) //give every spectator seconds time to become a player { - if(plr.classname == "spectator" || plr.classname == "observer") + if(IS_SPEC(plr) || IS_OBSERVER(plr)) + if(!plr.caplayer) { plr.spectatortime = time; - sprint(plr, strcat("^7You have to become a player within the next ", ftos(autocvar_g_maxplayers_spectator_blocktime), " seconds, otherwise you will be kicked, because spectators aren't allowed at this time!\n")); + Send_Notification(NOTIF_ONE_ONLY, plr, MSG_INFO, INFO_SPECTATE_WARNING, autocvar_g_maxplayers_spectator_blocktime); } } bprint(strcat("^7All spectators will be automatically kicked when not joining the game after ", ftos(autocvar_g_maxplayers_spectator_blocktime), " seconds!\n")); return; } - + default: case CMD_REQUEST_USAGE: { @@ -1130,7 +1212,7 @@ void GameCommand_nospectators(float request) } void GameCommand_playerdemo(float request, float argc) -{ +{ switch(request) { case CMD_REQUEST_COMMAND: @@ -1139,58 +1221,58 @@ void GameCommand_playerdemo(float request, float argc) { entity client; float i, n, accepted; - + switch(argv(1)) { case "read": { client = GetIndexedEntity(argc, 2); - accepted = VerifyClientEntity(client, FALSE, TRUE); - - if not(accepted > 0) + accepted = VerifyClientEntity(client, false, true); + + if(accepted <= 0) { - print("playerdemo: read: ", GetClientErrorString(accepted, argv(2)), ".\n"); + print("playerdemo: read: ", GetClientErrorString(accepted, argv(2)), ".\n"); return; } - + self = client; playerdemo_open_read(argv(next_token)); return; } - + case "write": { client = GetIndexedEntity(argc, 2); - accepted = VerifyClientEntity(client, FALSE, FALSE); - - if not(accepted > 0) + accepted = VerifyClientEntity(client, false, false); + + if(accepted <= 0) { - print("playerdemo: write: ", GetClientErrorString(accepted, argv(2)), ".\n"); + print("playerdemo: write: ", GetClientErrorString(accepted, argv(2)), ".\n"); return; } - + self = client; playerdemo_open_write(argv(next_token)); return; } - + case "auto_read_and_write": { n = GetFilteredNumber(argv(3)); cvar_set("bot_number", ftos(n)); - + localcmd("wait; wait; wait\n"); for(i = 0; i < n; ++i) { localcmd("sv_cmd playerdemo read ", ftos(i+2), " ", argv(2), ftos(i+1), "\n"); } - + localcmd("sv_cmd playerdemo write 1 ", ftos(n+1), "\n"); return; } - + case "auto_read": { n = GetFilteredNumber(argv(3)); cvar_set("bot_number", ftos(n)); - + localcmd("wait; wait; wait\n"); for(i = 0; i < n; ++i) { localcmd("sv_cmd playerdemo read ", ftos(i+2), " ", argv(2), ftos(i+1), "\n"); } return; @@ -1198,7 +1280,7 @@ void GameCommand_playerdemo(float request, float argc) } } } - + default: print("Incorrect parameters for ^2playerdemo^7\n"); case CMD_REQUEST_USAGE: @@ -1210,17 +1292,17 @@ void GameCommand_playerdemo(float request, float argc) } } -void GameCommand_printstats(float request) +void GameCommand_printstats(float request) { switch(request) { case CMD_REQUEST_COMMAND: { - DumpStats(FALSE); + DumpStats(false); print("stats dumped.\n"); return; } - + default: case CMD_REQUEST_USAGE: { @@ -1240,7 +1322,7 @@ void GameCommand_radarmap(float request, float argc) if(RadarMap_Make(argc)) return; } - + default: print("Incorrect parameters for ^2radarmap^7\n"); case CMD_REQUEST_USAGE: @@ -1254,7 +1336,7 @@ void GameCommand_radarmap(float request, float argc) } } -void GameCommand_reducematchtime(float request) +void GameCommand_reducematchtime(float request) { switch(request) { @@ -1263,7 +1345,7 @@ void GameCommand_reducematchtime(float request) changematchtime(autocvar_timelimit_decrement *-60, autocvar_timelimit_min * 60, autocvar_timelimit_max * 60); return; } - + default: case CMD_REQUEST_USAGE: { @@ -1289,7 +1371,7 @@ void GameCommand_setbots(float request, float argc) return; } } - + default: print("Incorrect parameters for ^2setbots^7\n"); case CMD_REQUEST_USAGE: @@ -1311,7 +1393,8 @@ void GameCommand_shuffleteams(float request) if(teamplay) { entity tmp_player; - float i, x, z, t_teams, t_players, team_color; + int i; + float x, t_teams, t_players, team_color; // count the total amount of players and total amount of teams t_players = 0; @@ -1319,22 +1402,22 @@ void GameCommand_shuffleteams(float request) FOR_EACH_PLAYER(tmp_player) { CheckAllowedTeams(tmp_player); - + if(c1 >= 0) t_teams = max(1, t_teams); if(c2 >= 0) t_teams = max(2, t_teams); if(c3 >= 0) t_teams = max(3, t_teams); if(c4 >= 0) t_teams = max(4, t_teams); - + ++t_players; } - + // build a list of the players in a random order FOR_EACH_PLAYER(tmp_player) { - for(;;) + for (;;) { i = bound(1, floor(random() * maxclients) + 1, maxclients); - + if(shuffleteams_players[i]) { continue; // a player is already assigned to this slot @@ -1347,28 +1430,28 @@ void GameCommand_shuffleteams(float request) } } - // finally, from the list made earlier, re-join the players in different order. - for(i = 1; i <= t_teams; ++i) + // finally, from the list made earlier, re-join the players in different order. + for (int i = 1; i <= t_teams; ++i) { // find out how many players to assign to this team x = (t_players / t_teams); x = ((i == 1) ? ceil(x) : floor(x)); - - team_color = NumberToTeamNumber(i); - - // sort through the random list of players made earlier - for(z = 1; z <= maxclients; ++z) - { - if not(shuffleteams_teams[i] >= x) + + team_color = Team_NumberToTeam(i); + + // sort through the random list of players made earlier + for (int z = 1; z <= maxclients; ++z) + { + if (!(shuffleteams_teams[i] >= x)) { - if not(shuffleteams_players[z]) + if (!(shuffleteams_players[z])) continue; // not a player, move on to next random slot - + if(VerifyClientNumber(shuffleteams_players[z])) self = edict_num(shuffleteams_players[z]); - if(self.team != team_color) - MoveToTeam(self, team_color, 6, 0); + if(self.team != team_color) + MoveToTeam(self, team_color, 6); shuffleteams_players[z] = 0; shuffleteams_teams[i] = shuffleteams_teams[i] + 1; @@ -1379,13 +1462,13 @@ void GameCommand_shuffleteams(float request) } } } - + bprint("Successfully shuffled the players around randomly.\n"); - + // clear the buffers now for (i=0; i 0) { stuffcmd(client, strcat("\n", argv(next_token), "\n")); print(strcat("Command: \"", argv(next_token), "\" sent to ", GetCallerName(client), " (", argv(1) ,").\n")); } else - print("stuffto: ", GetClientErrorString(accepted, argv(1)), ".\n"); - + print("stuffto: ", GetClientErrorString(accepted, argv(1)), ".\n"); + return; } } - + default: print("Incorrect parameters for ^2stuffto^7\n"); case CMD_REQUEST_USAGE: @@ -1465,76 +1548,78 @@ void GameCommand_trace(float request, float argc) entity e; vector org, delta, start, end, p, q, q0, pos, vv, dv; float i, f, safe, unsafe, dq, dqf; - + switch(argv(1)) { case "debug": { + float hitcount = 0; print("TEST CASE. If this returns the runaway loop counter error, possibly everything is oaky.\n"); - for(;;) + float worst_endpos_bug = 0; + for (;;) { org = world.mins; delta = world.maxs - world.mins; - start_x = org_x + random() * delta_x; - start_y = org_y + random() * delta_y; - start_z = org_z + random() * delta_z; + start.x = org.x + random() * delta.x; + start.y = org.y + random() * delta.y; + start.z = org.z + random() * delta.z; - end_x = org_x + random() * delta_x; - end_y = org_y + random() * delta_y; - end_z = org_z + random() * delta_z; + end.x = org.x + random() * delta.x; + end.y = org.y + random() * delta.y; + end.z = org.z + random() * delta.z; start = stov(vtos(start)); end = stov(vtos(end)); tracebox(start, PL_MIN, PL_MAX, end, MOVE_NOMONSTERS, world); - if(!trace_startsolid) + if(!trace_startsolid && trace_fraction < 1) { p = trace_endpos; tracebox(p, PL_MIN, PL_MAX, p, MOVE_NOMONSTERS, world); - if(trace_startsolid || trace_fraction == 1) + if(trace_startsolid) { rint(42); // do an engine breakpoint on VM_rint so you can get the trace that errnoeously returns startsolid tracebox(start, PL_MIN, PL_MAX, end, MOVE_NOMONSTERS, world); - if(trace_startsolid) + // how much do we need to back off? + safe = 1; + unsafe = 0; + for (;;) { - // how much do we need to back off? - safe = 1; - unsafe = 0; - for(;;) + pos = p * (1 - (safe + unsafe) * 0.5) + start * ((safe + unsafe) * 0.5); + tracebox(pos, PL_MIN, PL_MAX, pos, MOVE_NOMONSTERS, world); + if(trace_startsolid) { - pos = p * (1 - (safe + unsafe) * 0.5) + start * ((safe + unsafe) * 0.5); - tracebox(pos, PL_MIN, PL_MAX, pos, MOVE_NOMONSTERS, world); - if(trace_startsolid) - { - if((safe + unsafe) * 0.5 == unsafe) - break; - unsafe = (safe + unsafe) * 0.5; - } - else - { - if((safe + unsafe) * 0.5 == safe) - break; - safe = (safe + unsafe) * 0.5; - } + if((safe + unsafe) * 0.5 == unsafe) + break; + unsafe = (safe + unsafe) * 0.5; } - - print("safe distance to back off: ", ftos(safe * vlen(p - start)), "qu\n"); - print("unsafe distance to back off: ", ftos(unsafe * vlen(p - start)), "qu\n"); - - tracebox(p, PL_MIN + '0.1 0.1 0.1', PL_MAX - '0.1 0.1 0.1', p, MOVE_NOMONSTERS, world); - if(trace_startsolid) - print("trace_endpos much in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n"); else - print("trace_endpos just in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n"); - break; + { + if((safe + unsafe) * 0.5 == safe) + break; + safe = (safe + unsafe) * 0.5; + } } + print("safe distance to back off: ", ftos(safe * vlen(p - start)), "qu\n"); + print("unsafe distance to back off: ", ftos(unsafe * vlen(p - start)), "qu\n"); + + tracebox(p, PL_MIN + '0.1 0.1 0.1', PL_MAX - '0.1 0.1 0.1', p, MOVE_NOMONSTERS, world); + if(trace_startsolid) + print("trace_endpos much in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n"); + else + print("trace_endpos just in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n"); + if (++hitcount >= 10) + break; + } + else + { q0 = p; dq = 0; dqf = 1; - for(;;) + for (;;) { q = p + normalize(end - p) * (dq + dqf); if(q == q0) @@ -1547,18 +1632,20 @@ void GameCommand_trace(float request, float argc) dqf *= 0.5; q0 = q; } - if(dq > 0) + if(dq > worst_endpos_bug) { + worst_endpos_bug = dq; print("trace_endpos still before solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n"); print("could go ", ftos(dq), " units further to ", vtos(q), "\n"); - break; + if (++hitcount >= 10) + break; } } } } return; } - + case "debug2": { e = nextent(world); @@ -1573,53 +1660,53 @@ void GameCommand_trace(float request, float argc) for(i = 0; i < 100000; ++i) { dv = randomvec(); - if(dv_z > 0) + if(dv.z > 0) dv = -1 * dv; tracebox(vv, e.mins, e.maxs, vv + dv, MOVE_NORMAL, e); if(trace_startsolid) print("bug 1\n"); if(trace_fraction == 1) - if(dv_z < f) + if(dv.z < f) { - print("bug 2: ", ftos(dv_x), " ", ftos(dv_y), " ", ftos(dv_z)); - print(" (", ftos(asin(dv_z / vlen(dv)) * 180 / M_PI), " degrees)\n"); - f = dv_z; + print("bug 2: ", ftos(dv.x), " ", ftos(dv.y), " ", ftos(dv.z)); + print(" (", ftos(asin(dv.z / vlen(dv)) * 180 / M_PI), " degrees)\n"); + f = dv.z; } } print("highest possible dist: ", ftos(f), "\n"); return; } - + case "walk": { - if(argc == 3) + if(argc == 4) { e = nextent(world); - if(tracewalk(e, stov(argv(1)), e.mins, e.maxs, stov(argv(2)), MOVE_NORMAL)) + if(tracewalk(e, stov(argv(2)), e.mins, e.maxs, stov(argv(3)), MOVE_NORMAL)) print("can walk\n"); else print("cannot walk\n"); return; } } - + case "showline": { - if(argc == 3) + if(argc == 4) { - vv = stov(argv(1)); - dv = stov(argv(2)); + vv = stov(argv(2)); + dv = stov(argv(3)); traceline(vv, dv, MOVE_NORMAL, world); trailparticles(world, particleeffectnum("TR_NEXUIZPLASMA"), vv, trace_endpos); trailparticles(world, particleeffectnum("TR_CRYLINKPLASMA"), trace_endpos, dv); return; } } - + // no default case, just go straight to invalid } } - + default: print("Incorrect parameters for ^2trace^7\n"); case CMD_REQUEST_USAGE: @@ -1649,7 +1736,7 @@ void GameCommand_unlockteams(float request) } return; } - + default: case CMD_REQUEST_USAGE: { @@ -1673,7 +1760,7 @@ void GameCommand_warp(float request, float argc) { CampaignLevelWarp(stof(argv(1))); print("Successfully warped to campaign level ", stof(argv(1)), ".\n"); - } + } else { CampaignLevelWarp(-1); @@ -1684,7 +1771,7 @@ void GameCommand_warp(float request, float argc) print("Not in campaign, can't level warp\n"); return; } - + default: case CMD_REQUEST_USAGE: { @@ -1704,10 +1791,10 @@ void GameCommand_(float request) { case CMD_REQUEST_COMMAND: { - + return; } - + default: case CMD_REQUEST_USAGE: { @@ -1725,9 +1812,9 @@ void GameCommand_(float request) // ================================== // Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;) -// Common commands have double indentation to separate them a bit. #define SERVER_COMMANDS(request,arguments,command) \ SERVER_COMMAND("adminmsg", GameCommand_adminmsg(request, arguments), "Send an admin message to a client directly") \ + SERVER_COMMAND("mobbutcher", GameCommand_mobbutcher(request), "Instantly removes all monsters on the map") \ SERVER_COMMAND("allready", GameCommand_allready(request), "Restart the server and reset the players") \ SERVER_COMMAND("allspec", GameCommand_allspec(request, arguments), "Force all players to spectate") \ SERVER_COMMAND("anticheat", GameCommand_anticheat(request, arguments), "Create an anticheat report for a client") \ @@ -1765,46 +1852,46 @@ void GameCommand_macro_help() { #define SERVER_COMMAND(name,function,description) \ { print(" ^2", name, "^7: ", description, "\n"); } - - SERVER_COMMANDS(0, 0, "") + + SERVER_COMMANDS(0, 0, ""); #undef SERVER_COMMAND - + return; } float GameCommand_macro_command(float argc, string command) { #define SERVER_COMMAND(name,function,description) \ - { if(name == strtolower(argv(0))) { function; return TRUE; } } - - SERVER_COMMANDS(CMD_REQUEST_COMMAND, argc, command) + { if(name == strtolower(argv(0))) { function; return true; } } + + SERVER_COMMANDS(CMD_REQUEST_COMMAND, argc, command); #undef SERVER_COMMAND - - return FALSE; + + return false; } float GameCommand_macro_usage(float argc) { #define SERVER_COMMAND(name,function,description) \ - { if(name == strtolower(argv(1))) { function; return TRUE; } } - - SERVER_COMMANDS(CMD_REQUEST_USAGE, argc, "") + { if(name == strtolower(argv(1))) { function; return true; } } + + SERVER_COMMANDS(CMD_REQUEST_USAGE, argc, ""); #undef SERVER_COMMAND - - return FALSE; + + return false; } void GameCommand_macro_write_aliases(float fh) { #define SERVER_COMMAND(name,function,description) \ { CMD_Write_Alias("qc_cmd_sv", name, description); } - - SERVER_COMMANDS(0, 0, "") + + SERVER_COMMANDS(0, 0, ""); #undef SERVER_COMMAND - + return; } - + // ========================================= // Main Function Called By Engine (sv_cmd) @@ -1814,33 +1901,33 @@ void GameCommand_macro_write_aliases(float fh) void GameCommand(string command) { float argc = tokenize_console(command); - + // Guide for working with argc arguments by example: // argc: 1 - 2 - 3 - 4 - // argv: 0 - 1 - 2 - 3 + // argv: 0 - 1 - 2 - 3 // cmd vote - master - login - password - if(strtolower(argv(0)) == "help") + if(strtolower(argv(0)) == "help") { - if(argc == 1) + if(argc == 1) { print("\nServer console commands:\n"); GameCommand_macro_help(); - + print("\nBanning commands:\n"); BanCommand_macro_help(); - + print("\nCommon networked commands:\n"); CommonCommand_macro_help(world); - + print("\nGeneric commands shared by all programs:\n"); GenericCommand_macro_help(); - + print("\nUsage:^3 sv_cmd COMMAND...^7, where possible commands are listed above.\n"); print("For help about a specific command, type sv_cmd help COMMAND\n"); - + return; - } + } else if(BanCommand_macro_usage(argc)) // Instead of trying to call a command, we're going to see detailed information about it { return; @@ -1857,8 +1944,8 @@ void GameCommand(string command) { return; } - } - else if(BanCommand(command)) + } + else if(BanCommand(command)) { return; // handled by server/command/ipban.qc } @@ -1866,7 +1953,7 @@ void GameCommand(string command) { return; // handled by server/command/common.qc } - else if(GenericCommand(command)) + else if(GenericCommand(command)) { return; // handled by common/command/generic.qc } @@ -1874,9 +1961,9 @@ void GameCommand(string command) { return; // handled by one of the above GameCommand_* functions } - + // nothing above caught the command, must be invalid print(((command != "") ? strcat("Unknown server command \"", command, "\"") : "No command provided"), ". For a list of supported commands, try sv_cmd help.\n"); - + return; }