X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fsv_cmd.qc;h=43ce29160bbcc755b2ece904dcbe41d2d1fe2299;hp=bb59566d2a7e6da9bdf9231589aba6299f4e8f6f;hb=98b2c4213abe04f3ec96a95471ba5fe5fe57e008;hpb=3e21073f2bd7f282947bc1f214b3ec25d69ccae0 diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index bb59566d2..43ce29160 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -1,5 +1,7 @@ #include "sv_cmd.qh" -#include "all.qh" +#include "_mod.qh" + +#include #include "banning.qh" #include "cmd.qh" @@ -9,8 +11,8 @@ #include "../anticheat.qh" #include "../campaign.qh" -#include "../cl_client.qh" -#include "../cl_player.qh" +#include "../client.qh" +#include "../player.qh" #include "../g_world.qh" #include "../ipban.qh" #include "../playerdemo.qh" @@ -18,9 +20,10 @@ #include "../bot/api.qh" -#include "../mutators/all.qh" +#include "../mutators/_mod.qh" #include +#include #include #include #include @@ -33,7 +36,6 @@ void PutObserverInServer(entity this); // ===================================================== // Server side game commands code, reworked by Samual -// Last updated: December 29th, 2011 // ===================================================== // used by GameCommand_make_mapinfo() @@ -41,7 +43,7 @@ void make_mapinfo_Think(entity this) { if (_MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 0, 0, 1)) { - LOG_INFO("Done rebuiling mapinfos.\n"); + LOG_INFO("Done rebuiling mapinfos."); MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0); delete(this); } @@ -123,7 +125,7 @@ void GameCommand_adminmsg(float request, float argc) if (accepted <= 0) { - LOG_INFO("adminmsg: ", GetClientErrorString(accepted, t), (targets ? ", skipping to next player.\n" : ".\n")); + LOG_INFO("adminmsg: ", GetClientErrorString(accepted, t), (targets ? ", skipping to next player.\n" : ".")); continue; } @@ -134,32 +136,32 @@ void GameCommand_adminmsg(float request, float argc) } else { - centerprint(client, strcat("^3", admin_name(), ":\n^7", admin_message)); - sprint(client, strcat("\{1}\{13}^3", admin_name(), "^7: ", admin_message, "\n")); + centerprint(client, strcat("^3", GetCallerName(NULL), ":\n^7", admin_message)); + sprint(client, strcat("\{1}\{13}^3", GetCallerName(NULL), "^7: ", admin_message, "\n")); } - successful = strcat(successful, (successful ? ", " : ""), client.netname); - LOG_TRACE("Message sent to ", client.netname); + successful = strcat(successful, (successful ? ", " : ""), playername(client, false)); + LOG_TRACE("Message sent to ", playername(client, false)); continue; } if (successful) bprint("Successfully sent message '", admin_message, "' to ", successful, ".\n"); - else LOG_INFO("No players given (", original_targets, ") could receive the message.\n"); + else LOG_INFO("No players given (", original_targets, ") could receive the message."); return; } } default: - LOG_INFO("Incorrect parameters for ^2adminmsg^7\n"); + LOG_INFO("Incorrect parameters for ^2adminmsg^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd adminmsg clients \"message\" [infobartime]\n"); - LOG_INFO(" 'clients' is a list (separated by commas) of player entity ID's or nicknames\n"); - LOG_INFO(" If infobartime is provided, the message will be sent to infobar.\n"); - LOG_INFO(" Otherwise, it will just be sent as a centerprint message.\n"); - LOG_INFO("Examples: adminmsg 2,4 \"this infomessage will last for ten seconds\" 10\n"); - LOG_INFO(" adminmsg 2,5 \"this message will be a centerprint\"\n"); + LOG_INFO("Usage:^3 sv_cmd adminmsg clients \"message\" [infobartime]"); + LOG_INFO(" 'clients' is a list (separated by commas) of player entity ID's or nicknames"); + LOG_INFO(" If infobartime is provided, the message will be sent to infobar."); + LOG_INFO(" Otherwise, it will just be sent as a centerprint message."); + LOG_INFO("Examples: adminmsg 2,4 \"this infomessage will last for ten seconds\" 10"); + LOG_INFO(" adminmsg 2,5 \"this message will be a centerprint\""); return; } } @@ -178,8 +180,8 @@ void GameCommand_allready(float request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd allready\n"); - LOG_INFO(" No arguments required.\n"); + LOG_INFO("Usage:^3 sv_cmd allready"); + LOG_INFO(" No arguments required."); return; } } @@ -193,22 +195,22 @@ void GameCommand_allspec(float request, float argc) { string reason = argv(1); int n = 0; - FOREACH_CLIENT(IS_PLAYER(it) && IS_REAL_CLIENT(it), LAMBDA( + FOREACH_CLIENT(IS_PLAYER(it) && IS_REAL_CLIENT(it), { if (it.caplayer) it.caplayer = 0; PutObserverInServer(it); ++n; - )); + }); if (n) bprint(strcat("Successfully forced all (", ftos(n), ") players to spectate", (reason ? strcat(" for reason: '", reason, "'") : ""), ".\n")); - else LOG_INFO("No players found to spectate.\n"); + else LOG_INFO("No players found to spectate."); return; } default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd allspec [reason]\n"); - LOG_INFO(" Where 'reason' is an optional argument for explanation of allspec command.\n"); - LOG_INFO("See also: ^2moveplayer, shuffleteams^7\n"); + LOG_INFO("Usage:^3 sv_cmd allspec [reason]"); + LOG_INFO(" Where 'reason' is an optional argument for explanation of allspec command."); + LOG_INFO("See also: ^2moveplayer, shuffleteams^7"); return; } } @@ -225,21 +227,21 @@ void GameCommand_anticheat(float request, float argc) if (accepted > 0) { - anticheat_report(client); + anticheat_report_to_eventlog(client); return; } else { - LOG_INFO("anticheat: ", GetClientErrorString(accepted, argv(1)), ".\n"); + LOG_INFO("anticheat: ", GetClientErrorString(accepted, argv(1)), "."); } } default: - LOG_INFO("Incorrect parameters for ^2anticheat^7\n"); + LOG_INFO("Incorrect parameters for ^2anticheat^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd anticheat client\n"); - LOG_INFO(" 'client' is the entity number or name of the player.\n"); + LOG_INFO("Usage:^3 sv_cmd anticheat client"); + LOG_INFO(" 'client' is the entity number or name of the player."); return; } } @@ -251,20 +253,15 @@ void GameCommand_bbox(float request) { case CMD_REQUEST_COMMAND: { - LOG_INFO("Original size: ", ftos(world.absmin.x), " ", ftos(world.absmin.y), " ", ftos(world.absmin.z)); - LOG_INFO(" ", ftos(world.absmax.x), " ", ftos(world.absmax.y), " ", ftos(world.absmax.z), "\n"); - LOG_INFO("Currently set size: ", ftos(world.mins.x), " ", ftos(world.mins.y), " ", ftos(world.mins.z)); - LOG_INFO(" ", ftos(world.maxs.x), " ", ftos(world.maxs.y), " ", ftos(world.maxs.z), "\n"); - LOG_INFO("Solid bounding box size:"); - + vector size_min = '0 0 0'; + vector size_max = '0 0 0'; 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, NULL); - if (trace_startsolid) LOG_INFO(" ", ftos(world.absmin.x)); - else LOG_INFO(" ", ftos(trace_endpos.x)); + size_min.x = (trace_startsolid) ? world.absmin.x : trace_endpos.x; tracebox('0 1 0' * world.absmin.y, '1 0 0' * world.absmin.x + '0 0 1' * world.absmin.z, @@ -272,8 +269,7 @@ void GameCommand_bbox(float request) '0 1 0' * world.absmax.y, MOVE_WORLDONLY, NULL); - if (trace_startsolid) LOG_INFO(" ", ftos(world.absmin.y)); - else LOG_INFO(" ", ftos(trace_endpos.y)); + size_min.y = (trace_startsolid) ? world.absmin.y : trace_endpos.y; tracebox('0 0 1' * world.absmin.z, '1 0 0' * world.absmin.x + '0 1 0' * world.absmin.y, @@ -281,8 +277,7 @@ void GameCommand_bbox(float request) '0 0 1' * world.absmax.z, MOVE_WORLDONLY, NULL); - if (trace_startsolid) LOG_INFO(" ", ftos(world.absmin.z)); - else LOG_INFO(" ", ftos(trace_endpos.z)); + size_min.z = (trace_startsolid) ? world.absmin.z : trace_endpos.z; tracebox('1 0 0' * world.absmax.x, '0 1 0' * world.absmin.y + '0 0 1' * world.absmin.z, @@ -290,8 +285,7 @@ void GameCommand_bbox(float request) '1 0 0' * world.absmin.x, MOVE_WORLDONLY, NULL); - if (trace_startsolid) LOG_INFO(" ", ftos(world.absmax.x)); - else LOG_INFO(" ", ftos(trace_endpos.x)); + size_max.x = (trace_startsolid) ? world.absmax.x : trace_endpos.x; tracebox('0 1 0' * world.absmax.y, '1 0 0' * world.absmin.x + '0 0 1' * world.absmin.z, @@ -299,8 +293,7 @@ void GameCommand_bbox(float request) '0 1 0' * world.absmin.y, MOVE_WORLDONLY, NULL); - if (trace_startsolid) LOG_INFO(" ", ftos(world.absmax.y)); - else LOG_INFO(" ", ftos(trace_endpos.y)); + size_max.y = (trace_startsolid) ? world.absmax.y : trace_endpos.y; tracebox('0 0 1' * world.absmax.z, '1 0 0' * world.absmin.x + '0 1 0' * world.absmin.y, @@ -308,19 +301,20 @@ void GameCommand_bbox(float request) '0 0 1' * world.absmin.z, MOVE_WORLDONLY, NULL); - if (trace_startsolid) LOG_INFO(" ", ftos(world.absmax.z)); - else LOG_INFO(" ", ftos(trace_endpos.z)); + size_max.z = (trace_startsolid) ? world.absmax.z : trace_endpos.z; - LOG_INFO("\n"); + LOG_INFOF("Original size: %v %v", world.absmin, world.absmax); + LOG_INFOF("Currently set size: %v %v", world.mins, world.maxs); + LOG_INFOF("Solid bounding box size: %v %v", size_min, size_max); return; } default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd bbox\n"); - LOG_INFO(" No arguments required.\n"); - LOG_INFO("See also: ^2gettaginfo, trace^7\n"); + LOG_INFO("Usage:^3 sv_cmd bbox"); + LOG_INFO(" No arguments required."); + LOG_INFO("See also: ^2gettaginfo, trace^7"); return; } } @@ -346,7 +340,7 @@ void GameCommand_bot_cmd(float request, float argc, string command) cvar_settemp("bot_number", "0"); bot_fixcount(); cvar_settemp("bot_number", argv(2)); - if (!bot_fixcount()) LOG_INFO("Sorry, could not set requested bot count\n"); + if (!bot_fixcount()) LOG_INFO("Sorry, could not set requested bot count"); return; } else if (argv(1) == "load" && argc == 3) @@ -356,7 +350,7 @@ void GameCommand_bot_cmd(float request, float argc, string command) fh = fopen(argv(2), FILE_READ); if (fh < 0) { - LOG_INFO("cannot open the file\n"); + LOG_INFO("cannot open the file"); return; } @@ -378,14 +372,20 @@ void GameCommand_bot_cmd(float request, float argc, string command) cvar_settemp("bot_number", "0"); bot_fixcount(); cvar_settemp("bot_number", argv(3)); - if (!bot_fixcount()) LOG_INFO("Sorry, could not set requested bot count\n"); + if (!bot_fixcount()) LOG_INFO("Sorry, could not set requested bot count"); } else { - // let's start at token 2 so we can skip sv_cmd bot_cmd - bot = find_bot_by_number(stof(argv(2))); - if (bot == NULL) bot = find_bot_by_name(argv(2)); - if (bot) bot_queuecommand(bot, substring(s, argv_start_index(3), -1)); + if(argv(2) == "*" || argv(2) == "all") + FOREACH_CLIENT(IS_BOT_CLIENT(it), { + bot_queuecommand(it, substring(s, argv_start_index(3), -1)); + }); + else + { + bot = find_bot_by_number(stof(argv(2))); + if (bot == NULL) bot = find_bot_by_name(argv(2)); + if (bot) bot_queuecommand(bot, substring(s, argv_start_index(3), -1)); + } } } else @@ -395,7 +395,7 @@ void GameCommand_bot_cmd(float request, float argc, string command) ++i; } - LOG_INFO(ftos(i), " commands read\n"); + LOG_INFO(ftos(i), " commands read"); fclose(fh); return; } @@ -407,30 +407,46 @@ void GameCommand_bot_cmd(float request, float argc, string command) } else if (argc >= 3) // this comes last { - bot = find_bot_by_number(stof(argv(1))); - if (bot == NULL) bot = find_bot_by_name(argv(1)); - if (bot) + if(argv(1) == "*" || argv(1) == "all") { - LOG_INFO(strcat("Command '", substring(command, argv_start_index(2), -1), "' sent to bot ", bot.netname, "\n")); - bot_queuecommand(bot, substring(command, argv_start_index(2), -1)); + int bot_num = 0; + FOREACH_CLIENT(IS_BOT_CLIENT(it), { + bot_queuecommand(it, substring(command, argv_start_index(2), -1)); + bot_num++; + }); + if(bot_num) + LOG_INFO("Command '", substring(command, argv_start_index(2), -1), "' sent to all bots (", ftos(bot_num), ")"); return; } else { - LOG_INFO(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 + bot = find_bot_by_number(stof(argv(1))); + if (bot == NULL) bot = find_bot_by_name(argv(1)); + if (bot) + { + LOG_INFO("Command '", substring(command, argv_start_index(2), -1), "' sent to bot ", bot.netname); + bot_queuecommand(bot, substring(command, argv_start_index(2), -1)); + return; + } + else + { + LOG_INFO("Error: Can't find bot with the name or id '", argv(1), "' - Did you mistype the command?"); // don't return so that usage is shown + } } } } default: - LOG_INFO("Incorrect parameters for ^2bot_cmd^7\n"); + LOG_INFO("Incorrect parameters for ^2bot_cmd^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd bot_cmd client command [argument]\n"); - LOG_INFO(" 'client' can be either the name or entity id of the bot\n"); - LOG_INFO(" For full list of commands, see bot_cmd help [command].\n"); - LOG_INFO("Examples: sv_cmd bot_cmd client cc \"say something\"\n"); - LOG_INFO(" sv_cmd bot_cmd client presskey jump\n"); + LOG_INFO("Usage:^3 sv_cmd bot_cmd client command [argument]"); + LOG_INFO(" 'client' can be either the name of the bot or a progressive number (not the entity number!)"); + LOG_INFO(" can also be '*' or 'all' to allow sending the command to all the bots"); + LOG_INFO(" For full list of commands, see bot_cmd help [command]."); + LOG_INFO("Examples: sv_cmd bot_cmd 1 cc \"say something\""); + LOG_INFO(" sv_cmd bot_cmd 1 presskey jump"); + LOG_INFO(" sv_cmd bot_cmd * pause"); return; } } @@ -453,8 +469,8 @@ void GameCommand_cointoss(float request, float argc) default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd cointoss [result1 result2]\n"); - LOG_INFO(" Where 'result1' and 'result2' are user created options.\n"); + LOG_INFO("Usage:^3 sv_cmd cointoss [result1 result2]"); + LOG_INFO(" Where 'result1' and 'result2' are user created options."); return; } } @@ -471,33 +487,33 @@ void GameCommand_database(float request, float argc) if (argv(1) == "save") { db_save(ServerProgsDB, argv(2)); - LOG_INFO(strcat("Copied serverprogs database to '", argv(2), "' in the data directory.\n")); + LOG_INFO("Copied serverprogs database to '", argv(2), "' in the data directory."); return; } else if (argv(1) == "dump") { db_dump(ServerProgsDB, argv(2)); - LOG_INFO("DB dumped.\n"); // wtf does this do? + LOG_INFO("DB dumped."); // wtf does this do? return; } else if (argv(1) == "load") { db_close(ServerProgsDB); ServerProgsDB = db_load(argv(2)); - LOG_INFO(strcat("Loaded '", argv(2), "' as new serverprogs database.\n")); + LOG_INFO("Loaded '", argv(2), "' as new serverprogs database."); return; } } } default: - LOG_INFO("Incorrect parameters for ^2database^7\n"); + LOG_INFO("Incorrect parameters for ^2database^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd database action filename\n"); - LOG_INFO(" Where 'action' is the command to complete,\n"); - LOG_INFO(" and 'filename' is what it acts upon.\n"); - LOG_INFO(" Full list of commands here: \"save, dump, load.\"\n"); + LOG_INFO("Usage:^3 sv_cmd database action filename"); + LOG_INFO(" Where 'action' is the command to complete,"); + LOG_INFO(" and 'filename' is what it acts upon."); + LOG_INFO(" Full list of commands here: \"save, dump, load.\""); return; } } @@ -520,21 +536,21 @@ void GameCommand_defer_clear(float request, float argc) if (accepted > 0) { stuffcmd(client, "defer clear\n"); - LOG_INFO("defer clear stuffed to ", client.netname, "\n"); + LOG_INFO("defer clear stuffed to ", playername(client, false)); } - else { LOG_INFO("defer_clear: ", GetClientErrorString(accepted, argv(1)), ".\n"); } + else { LOG_INFO("defer_clear: ", GetClientErrorString(accepted, argv(1)), "."); } return; } } default: - LOG_INFO("Incorrect parameters for ^2defer_clear^7\n"); + LOG_INFO("Incorrect parameters for ^2defer_clear^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd defer_clear client\n"); - LOG_INFO(" 'client' is the entity number or name of the player.\n"); - LOG_INFO("See also: ^2defer_clear_all^7\n"); + LOG_INFO("Usage:^3 sv_cmd defer_clear client"); + LOG_INFO(" 'client' is the entity number or name of the player."); + LOG_INFO("See also: ^2defer_clear_all^7"); return; } } @@ -549,21 +565,21 @@ void GameCommand_defer_clear_all(float request) int n = 0; float argc; - FOREACH_CLIENT(true, LAMBDA( + FOREACH_CLIENT(true, { argc = tokenize_console(strcat("defer_clear ", ftos(etof(it)))); GameCommand_defer_clear(CMD_REQUEST_COMMAND, argc); ++n; - )); - if (n) LOG_INFO(strcat("Successfully stuffed defer clear to all clients (", ftos(n), ")\n")); // should a message be added if no players were found? + }); + if (n) LOG_INFO("Successfully stuffed defer clear to all clients (", ftos(n), ")"); // should a message be added if no players were found? return; } default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd defer_clear_all\n"); - LOG_INFO(" No arguments required.\n"); - LOG_INFO("See also: ^2defer_clear^7\n"); + LOG_INFO("Usage:^3 sv_cmd defer_clear_all"); + LOG_INFO(" No arguments required."); + LOG_INFO("See also: ^2defer_clear^7"); return; } } @@ -584,13 +600,13 @@ void GameCommand_delrec(float request, float argc) // perhaps merge later with } default: - LOG_INFO("Incorrect parameters for ^2delrec^7\n"); + LOG_INFO("Incorrect parameters for ^2delrec^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd delrec ranking [map]\n"); - LOG_INFO(" 'ranking' is which ranking level to clear up to, \n"); - LOG_INFO(" it will clear all records up to nth place.\n"); - LOG_INFO(" if 'map' is not provided it will use current map.\n"); + LOG_INFO("Usage:^3 sv_cmd delrec ranking [map]"); + LOG_INFO(" 'ranking' is which ranking level to clear up to, "); + LOG_INFO(" it will clear all records up to nth place."); + LOG_INFO(" if 'map' is not provided it will use current map."); return; } } @@ -606,79 +622,79 @@ void GameCommand_effectindexdump(float request) string s; d = db_create(); - LOG_INFO("begin of effects list\n"); + LOG_INFO("begin of effects list"); db_put(d, "TE_GUNSHOT", "1"); - LOG_INFO("effect TE_GUNSHOT is ", ftos(_particleeffectnum("TE_GUNSHOT")), "\n"); + LOG_INFO("effect TE_GUNSHOT is ", ftos(_particleeffectnum("TE_GUNSHOT"))); db_put(d, "TE_GUNSHOTQUAD", "1"); - LOG_INFO("effect TE_GUNSHOTQUAD is ", ftos(_particleeffectnum("TE_GUNSHOTQUAD")), "\n"); + LOG_INFO("effect TE_GUNSHOTQUAD is ", ftos(_particleeffectnum("TE_GUNSHOTQUAD"))); db_put(d, "TE_SPIKE", "1"); - LOG_INFO("effect TE_SPIKE is ", ftos(_particleeffectnum("TE_SPIKE")), "\n"); + LOG_INFO("effect TE_SPIKE is ", ftos(_particleeffectnum("TE_SPIKE"))); db_put(d, "TE_SPIKEQUAD", "1"); - LOG_INFO("effect TE_SPIKEQUAD is ", ftos(_particleeffectnum("TE_SPIKEQUAD")), "\n"); + LOG_INFO("effect TE_SPIKEQUAD is ", ftos(_particleeffectnum("TE_SPIKEQUAD"))); db_put(d, "TE_SUPERSPIKE", "1"); - LOG_INFO("effect TE_SUPERSPIKE is ", ftos(_particleeffectnum("TE_SUPERSPIKE")), "\n"); + LOG_INFO("effect TE_SUPERSPIKE is ", ftos(_particleeffectnum("TE_SUPERSPIKE"))); db_put(d, "TE_SUPERSPIKEQUAD", "1"); - LOG_INFO("effect TE_SUPERSPIKEQUAD is ", ftos(_particleeffectnum("TE_SUPERSPIKEQUAD")), "\n"); + LOG_INFO("effect TE_SUPERSPIKEQUAD is ", ftos(_particleeffectnum("TE_SUPERSPIKEQUAD"))); db_put(d, "TE_WIZSPIKE", "1"); - LOG_INFO("effect TE_WIZSPIKE is ", ftos(_particleeffectnum("TE_WIZSPIKE")), "\n"); + LOG_INFO("effect TE_WIZSPIKE is ", ftos(_particleeffectnum("TE_WIZSPIKE"))); db_put(d, "TE_KNIGHTSPIKE", "1"); - LOG_INFO("effect TE_KNIGHTSPIKE is ", ftos(_particleeffectnum("TE_KNIGHTSPIKE")), "\n"); + LOG_INFO("effect TE_KNIGHTSPIKE is ", ftos(_particleeffectnum("TE_KNIGHTSPIKE"))); db_put(d, "TE_EXPLOSION", "1"); - LOG_INFO("effect TE_EXPLOSION is ", ftos(_particleeffectnum("TE_EXPLOSION")), "\n"); + LOG_INFO("effect TE_EXPLOSION is ", ftos(_particleeffectnum("TE_EXPLOSION"))); db_put(d, "TE_EXPLOSIONQUAD", "1"); - LOG_INFO("effect TE_EXPLOSIONQUAD is ", ftos(_particleeffectnum("TE_EXPLOSIONQUAD")), "\n"); + LOG_INFO("effect TE_EXPLOSIONQUAD is ", ftos(_particleeffectnum("TE_EXPLOSIONQUAD"))); db_put(d, "TE_TAREXPLOSION", "1"); - LOG_INFO("effect TE_TAREXPLOSION is ", ftos(_particleeffectnum("TE_TAREXPLOSION")), "\n"); + LOG_INFO("effect TE_TAREXPLOSION is ", ftos(_particleeffectnum("TE_TAREXPLOSION"))); db_put(d, "TE_TELEPORT", "1"); - LOG_INFO("effect TE_TELEPORT is ", ftos(_particleeffectnum("TE_TELEPORT")), "\n"); + LOG_INFO("effect TE_TELEPORT is ", ftos(_particleeffectnum("TE_TELEPORT"))); db_put(d, "TE_LAVASPLASH", "1"); - LOG_INFO("effect TE_LAVASPLASH is ", ftos(_particleeffectnum("TE_LAVASPLASH")), "\n"); + LOG_INFO("effect TE_LAVASPLASH is ", ftos(_particleeffectnum("TE_LAVASPLASH"))); db_put(d, "TE_SMALLFLASH", "1"); - LOG_INFO("effect TE_SMALLFLASH is ", ftos(_particleeffectnum("TE_SMALLFLASH")), "\n"); + LOG_INFO("effect TE_SMALLFLASH is ", ftos(_particleeffectnum("TE_SMALLFLASH"))); db_put(d, "TE_FLAMEJET", "1"); - LOG_INFO("effect TE_FLAMEJET is ", ftos(_particleeffectnum("TE_FLAMEJET")), "\n"); + LOG_INFO("effect TE_FLAMEJET is ", ftos(_particleeffectnum("TE_FLAMEJET"))); db_put(d, "EF_FLAME", "1"); - LOG_INFO("effect EF_FLAME is ", ftos(_particleeffectnum("EF_FLAME")), "\n"); + LOG_INFO("effect EF_FLAME is ", ftos(_particleeffectnum("EF_FLAME"))); db_put(d, "TE_BLOOD", "1"); - LOG_INFO("effect TE_BLOOD is ", ftos(_particleeffectnum("TE_BLOOD")), "\n"); + LOG_INFO("effect TE_BLOOD is ", ftos(_particleeffectnum("TE_BLOOD"))); db_put(d, "TE_SPARK", "1"); - LOG_INFO("effect TE_SPARK is ", ftos(_particleeffectnum("TE_SPARK")), "\n"); + LOG_INFO("effect TE_SPARK is ", ftos(_particleeffectnum("TE_SPARK"))); db_put(d, "TE_PLASMABURN", "1"); - LOG_INFO("effect TE_PLASMABURN is ", ftos(_particleeffectnum("TE_PLASMABURN")), "\n"); + LOG_INFO("effect TE_PLASMABURN is ", ftos(_particleeffectnum("TE_PLASMABURN"))); db_put(d, "TE_TEI_G3", "1"); - LOG_INFO("effect TE_TEI_G3 is ", ftos(_particleeffectnum("TE_TEI_G3")), "\n"); + LOG_INFO("effect TE_TEI_G3 is ", ftos(_particleeffectnum("TE_TEI_G3"))); db_put(d, "TE_TEI_SMOKE", "1"); - LOG_INFO("effect TE_TEI_SMOKE is ", ftos(_particleeffectnum("TE_TEI_SMOKE")), "\n"); + LOG_INFO("effect TE_TEI_SMOKE is ", ftos(_particleeffectnum("TE_TEI_SMOKE"))); db_put(d, "TE_TEI_BIGEXPLOSION", "1"); - LOG_INFO("effect TE_TEI_BIGEXPLOSION is ", ftos(_particleeffectnum("TE_TEI_BIGEXPLOSION")), "\n"); + LOG_INFO("effect TE_TEI_BIGEXPLOSION is ", ftos(_particleeffectnum("TE_TEI_BIGEXPLOSION"))); db_put(d, "TE_TEI_PLASMAHIT", "1"); - LOG_INFO("effect TE_TEI_PLASMAHIT is ", ftos(_particleeffectnum("TE_TEI_PLASMAHIT")), "\n"); + LOG_INFO("effect TE_TEI_PLASMAHIT is ", ftos(_particleeffectnum("TE_TEI_PLASMAHIT"))); db_put(d, "EF_STARDUST", "1"); - LOG_INFO("effect EF_STARDUST is ", ftos(_particleeffectnum("EF_STARDUST")), "\n"); + LOG_INFO("effect EF_STARDUST is ", ftos(_particleeffectnum("EF_STARDUST"))); db_put(d, "TR_ROCKET", "1"); - LOG_INFO("effect TR_ROCKET is ", ftos(_particleeffectnum("TR_ROCKET")), "\n"); + LOG_INFO("effect TR_ROCKET is ", ftos(_particleeffectnum("TR_ROCKET"))); db_put(d, "TR_GRENADE", "1"); - LOG_INFO("effect TR_GRENADE is ", ftos(_particleeffectnum("TR_GRENADE")), "\n"); + LOG_INFO("effect TR_GRENADE is ", ftos(_particleeffectnum("TR_GRENADE"))); db_put(d, "TR_BLOOD", "1"); - LOG_INFO("effect TR_BLOOD is ", ftos(_particleeffectnum("TR_BLOOD")), "\n"); + LOG_INFO("effect TR_BLOOD is ", ftos(_particleeffectnum("TR_BLOOD"))); db_put(d, "TR_WIZSPIKE", "1"); - LOG_INFO("effect TR_WIZSPIKE is ", ftos(_particleeffectnum("TR_WIZSPIKE")), "\n"); + LOG_INFO("effect TR_WIZSPIKE is ", ftos(_particleeffectnum("TR_WIZSPIKE"))); db_put(d, "TR_SLIGHTBLOOD", "1"); - LOG_INFO("effect TR_SLIGHTBLOOD is ", ftos(_particleeffectnum("TR_SLIGHTBLOOD")), "\n"); + LOG_INFO("effect TR_SLIGHTBLOOD is ", ftos(_particleeffectnum("TR_SLIGHTBLOOD"))); db_put(d, "TR_KNIGHTSPIKE", "1"); - LOG_INFO("effect TR_KNIGHTSPIKE is ", ftos(_particleeffectnum("TR_KNIGHTSPIKE")), "\n"); + LOG_INFO("effect TR_KNIGHTSPIKE is ", ftos(_particleeffectnum("TR_KNIGHTSPIKE"))); db_put(d, "TR_VORESPIKE", "1"); - LOG_INFO("effect TR_VORESPIKE is ", ftos(_particleeffectnum("TR_VORESPIKE")), "\n"); + LOG_INFO("effect TR_VORESPIKE is ", ftos(_particleeffectnum("TR_VORESPIKE"))); db_put(d, "TR_NEHAHRASMOKE", "1"); - LOG_INFO("effect TR_NEHAHRASMOKE is ", ftos(_particleeffectnum("TR_NEHAHRASMOKE")), "\n"); + LOG_INFO("effect TR_NEHAHRASMOKE is ", ftos(_particleeffectnum("TR_NEHAHRASMOKE"))); db_put(d, "TR_NEXUIZPLASMA", "1"); - LOG_INFO("effect TR_NEXUIZPLASMA is ", ftos(_particleeffectnum("TR_NEXUIZPLASMA")), "\n"); + LOG_INFO("effect TR_NEXUIZPLASMA is ", ftos(_particleeffectnum("TR_NEXUIZPLASMA"))); db_put(d, "TR_GLOWTRAIL", "1"); - LOG_INFO("effect TR_GLOWTRAIL is ", ftos(_particleeffectnum("TR_GLOWTRAIL")), "\n"); + LOG_INFO("effect TR_GLOWTRAIL is ", ftos(_particleeffectnum("TR_GLOWTRAIL"))); db_put(d, "TR_SEEKER", "1"); - LOG_INFO("effect TR_SEEKER is ", ftos(_particleeffectnum("TR_SEEKER")), "\n"); + LOG_INFO("effect TR_SEEKER is ", ftos(_particleeffectnum("TR_SEEKER"))); db_put(d, "SVC_PARTICLE", "1"); - LOG_INFO("effect SVC_PARTICLE is ", ftos(_particleeffectnum("SVC_PARTICLE")), "\n"); + LOG_INFO("effect SVC_PARTICLE is ", ftos(_particleeffectnum("SVC_PARTICLE"))); fh = fopen("effectinfo.txt", FILE_READ); while ((s = fgets(fh))) @@ -689,12 +705,12 @@ void GameCommand_effectindexdump(float request) if (db_get(d, argv(1)) != "1") { int i = _particleeffectnum(argv(1)); - if (i >= 0) LOG_INFO("effect ", argv(1), " is ", ftos(i), "\n"); + if (i >= 0) LOG_INFO("effect ", argv(1), " is ", ftos(i)); db_put(d, argv(1), "1"); } } } - LOG_INFO("end of effects list\n"); + LOG_INFO("end of effects list"); db_close(d); return; @@ -703,8 +719,8 @@ void GameCommand_effectindexdump(float request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd effectindexdump\n"); - LOG_INFO(" No arguments required.\n"); + LOG_INFO("Usage:^3 sv_cmd effectindexdump"); + LOG_INFO(" No arguments required."); return; } } @@ -723,9 +739,9 @@ void GameCommand_extendmatchtime(float request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd extendmatchtime\n"); - LOG_INFO(" No arguments required.\n"); - LOG_INFO("See also: ^2reducematchtime^7\n"); + LOG_INFO("Usage:^3 sv_cmd extendmatchtime"); + LOG_INFO(" No arguments required."); + LOG_INFO("See also: ^2reducematchtime^7"); return; } } @@ -770,12 +786,12 @@ void GameCommand_gametype(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2gametype^7\n"); + LOG_INFO("Incorrect parameters for ^2gametype^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd gametype mode\n"); - LOG_INFO(" Where 'mode' is the gametype mode to switch to.\n"); - LOG_INFO("See also: ^2gotomap^7\n"); + LOG_INFO("Usage:^3 sv_cmd gametype mode"); + LOG_INFO(" Where 'mode' is the gametype mode to switch to."); + LOG_INFO("See also: ^2gotomap^7"); return; } } @@ -810,13 +826,15 @@ void GameCommand_gettaginfo(float request, float argc) if (i) { v = gettaginfo(tmp_entity, i); - LOG_INFO("model ", tmp_entity.model, " frame ", ftos(tmp_entity.frame), " tag ", gettaginfo_name); - LOG_INFO(" index ", ftos(i), " parent ", ftos(gettaginfo_parent), "\n"); - LOG_INFO(" vector = ", ftos(v.x), " ", ftos(v.y), " ", ftos(v.z), "\n"); - LOG_INFO(" offset = ", ftos(gettaginfo_offset.x), " ", ftos(gettaginfo_offset.y), " ", ftos(gettaginfo_offset.z), "\n"); - LOG_INFO(" forward = ", ftos(gettaginfo_forward.x), " ", ftos(gettaginfo_forward.y), " ", ftos(gettaginfo_forward.z), "\n"); - LOG_INFO(" right = ", ftos(gettaginfo_right.x), " ", ftos(gettaginfo_right.y), " ", ftos(gettaginfo_right.z), "\n"); - LOG_INFO(" up = ", ftos(gettaginfo_up.x), " ", ftos(gettaginfo_up.y), " ", ftos(gettaginfo_up.z), "\n"); + LOG_INFOF( + "model %s frame %s tag %s index %s parent %s", + tmp_entity.model, ftos(tmp_entity.frame), gettaginfo_name, ftos(i), ftos(gettaginfo_parent) + ); + LOG_INFOF(" vector = %s %s %s", ftos(v.x), ftos(v.y), ftos(v.z)); + LOG_INFOF(" offset = %s %s %s", ftos(gettaginfo_offset.x), ftos(gettaginfo_offset.y), ftos(gettaginfo_offset.z)); + LOG_INFOF(" forward = %s %s %s", ftos(gettaginfo_forward.x), ftos(gettaginfo_forward.y), ftos(gettaginfo_forward.z)); + LOG_INFOF(" right = %s %s %s", ftos(gettaginfo_right.x), ftos(gettaginfo_right.y), ftos(gettaginfo_right.z)); + LOG_INFOF(" up = %s %s %s", ftos(gettaginfo_up.x), ftos(gettaginfo_up.y), ftos(gettaginfo_up.z)); if (argc >= 6) { v.y = -v.y; @@ -825,7 +843,7 @@ void GameCommand_gettaginfo(float request, float argc) } else { - LOG_INFO("bone not found\n"); + LOG_INFO("bone not found"); } delete(tmp_entity); @@ -834,11 +852,11 @@ void GameCommand_gettaginfo(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2gettaginfo^7\n"); + LOG_INFO("Incorrect parameters for ^2gettaginfo^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd gettaginfo model frame index [command one] [command two]\n"); - LOG_INFO("See also: ^2bbox, trace^7\n"); + LOG_INFO("Usage:^3 sv_cmd gettaginfo model frame index [command one] [command two]"); + LOG_INFO("See also: ^2bbox, trace^7"); return; } } @@ -884,8 +902,8 @@ void GameCommand_animbench(float request, float argc) t2 += gettime(GETTIME_HIRES) - t0; n += 1; } - LOG_INFO("model ", tmp_entity.model, " frame ", ftos(f1), " animtime ", ftos(n / t1), "/s\n"); - LOG_INFO("model ", tmp_entity.model, " frame ", ftos(f2), " animtime ", ftos(n / t2), "/s\n"); + LOG_INFO("model ", tmp_entity.model, " frame ", ftos(f1), " animtime ", ftos(n / t1), "/s"); + LOG_INFO("model ", tmp_entity.model, " frame ", ftos(f2), " animtime ", ftos(n / t2), "/s"); delete(tmp_entity); return; @@ -893,11 +911,11 @@ void GameCommand_animbench(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2gettaginfo^7\n"); + LOG_INFO("Incorrect parameters for ^2gettaginfo^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd gettaginfo model frame index [command one] [command two]\n"); - LOG_INFO("See also: ^2bbox, trace^7\n"); + LOG_INFO("Usage:^3 sv_cmd gettaginfo model frame index [command one] [command two]"); + LOG_INFO("See also: ^2bbox, trace^7"); return; } } @@ -911,18 +929,18 @@ void GameCommand_gotomap(float request, float argc) { if (argv(1)) { - LOG_INFO(GotoMap(argv(1)), "\n"); + LOG_INFO(GotoMap(argv(1))); return; } } default: - LOG_INFO("Incorrect parameters for ^2gotomap^7\n"); + LOG_INFO("Incorrect parameters for ^2gotomap^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd gotomap map\n"); - LOG_INFO(" Where 'map' is the *.bsp file to change to.\n"); - LOG_INFO("See also: ^2gametype^7\n"); + LOG_INFO("Usage:^3 sv_cmd gotomap map"); + LOG_INFO(" Where 'map' is the *.bsp file to change to."); + LOG_INFO("See also: ^2gametype^7"); return; } } @@ -949,9 +967,9 @@ void GameCommand_lockteams(float request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd lockteams\n"); - LOG_INFO(" No arguments required.\n"); - LOG_INFO("See also: ^2unlockteams^7\n"); + LOG_INFO("Usage:^3 sv_cmd lockteams"); + LOG_INFO(" No arguments required."); + LOG_INFO("See also: ^2unlockteams^7"); return; } } @@ -975,9 +993,9 @@ void GameCommand_make_mapinfo(float request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd make_mapinfo\n"); - LOG_INFO(" No arguments required.\n"); - LOG_INFO("See also: ^2radarmap^7\n"); + LOG_INFO("Usage:^3 sv_cmd make_mapinfo"); + LOG_INFO(" No arguments required."); + LOG_INFO("See also: ^2radarmap^7"); return; } } @@ -1013,7 +1031,7 @@ void GameCommand_moveplayer(float request, float argc) if (accepted <= 0) { - LOG_INFO("moveplayer: ", GetClientErrorString(accepted, t), (targets ? ", skipping to next player.\n" : ".\n")); + LOG_INFO("moveplayer: ", GetClientErrorString(accepted, t), (targets ? ", skipping to next player.\n" : ".")); continue; } @@ -1025,11 +1043,11 @@ void GameCommand_moveplayer(float request, float argc) if (client.caplayer) client.caplayer = 0; PutObserverInServer(client); - successful = strcat(successful, (successful ? ", " : ""), client.netname); + successful = strcat(successful, (successful ? ", " : ""), playername(client, false)); } else { - LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") is already spectating.\n"); + LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") is already spectating."); } continue; } @@ -1049,7 +1067,7 @@ void GameCommand_moveplayer(float request, float argc) if (team_id == client.team) // already on the destination team { // keep the forcing undone - LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") is already on the ", Team_ColoredFullName(client.team), (targets ? "^7, skipping to next player.\n" : "^7.\n")); + LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") is already on the ", Team_ColoredFullName(client.team), (targets ? "^7, skipping to next player.\n" : "^7.")); continue; } else if (team_id == 0) // auto team @@ -1066,54 +1084,54 @@ void GameCommand_moveplayer(float request, float argc) // Check to see if the destination team is even available switch (team_id) { - case NUM_TEAM_1: if (c1 == -1) { LOG_INFO("Sorry, can't move player to red team if it doesn't exist.\n"); return; } break; - case NUM_TEAM_2: if (c2 == -1) { LOG_INFO("Sorry, can't move player to blue team if it doesn't exist.\n"); return; } break; - case NUM_TEAM_3: if (c3 == -1) { LOG_INFO("Sorry, can't move player to yellow team if it doesn't exist.\n"); return; } break; - case NUM_TEAM_4: if (c4 == -1) { LOG_INFO("Sorry, can't move player to pink team if it doesn't exist.\n"); return; } break; + case NUM_TEAM_1: if (c1 == -1) { LOG_INFO("Sorry, can't move player to red team if it doesn't exist."); return; } break; + case NUM_TEAM_2: if (c2 == -1) { LOG_INFO("Sorry, can't move player to blue team if it doesn't exist."); return; } break; + case NUM_TEAM_3: if (c3 == -1) { LOG_INFO("Sorry, can't move player to yellow team if it doesn't exist."); return; } break; + case NUM_TEAM_4: if (c4 == -1) { LOG_INFO("Sorry, can't move player to pink team if it doesn't exist."); return; } break; - default: LOG_INFO("Sorry, can't move player here if team ", destination, " doesn't exist.\n"); + default: LOG_INFO("Sorry, can't move player here if team ", destination, " doesn't exist."); return; } // If so, lets continue and finally move the player client.team_forced = 0; MoveToTeam(client, team_id, 6); - successful = strcat(successful, (successful ? ", " : ""), client.netname); - LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") has been moved to the ", Team_ColoredFullName(team_id), "^7.\n"); + successful = strcat(successful, (successful ? ", " : ""), playername(client, false)); + LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") has been moved to the ", Team_ColoredFullName(team_id), "^7."); continue; } else { - LOG_INFO("Can't change teams when currently not playing a team game.\n"); + LOG_INFO("Can't change teams when currently not playing a team game."); return; } } else { - LOG_INFO("Can't change teams if the player isn't in the game.\n"); // well technically we could, but should we allow that? :P + LOG_INFO("Can't change teams if the player isn't in the game."); // well technically we could, but should we allow that? :P return; } } } if (successful) bprint("Successfully moved players ", successful, " to destination ", destination, ".\n"); - else LOG_INFO("No players given (", original_targets, ") are able to move.\n"); + else LOG_INFO("No players given (", original_targets, ") are able to move."); return; // still correct parameters so return to avoid usage print } } default: - LOG_INFO("Incorrect parameters for ^2moveplayer^7\n"); + LOG_INFO("Incorrect parameters for ^2moveplayer^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd moveplayer clients destination\n"); - LOG_INFO(" 'clients' is a list (separated by commas) of player entity ID's or nicknames\n"); - LOG_INFO(" 'destination' is what to send the player to, be it team or spectating\n"); - LOG_INFO(" Full list of destinations here: \"spec, spectator, red, blue, yellow, pink, auto.\"\n"); - LOG_INFO("Examples: sv_cmd moveplayer 1,3,5 red 3\n"); - LOG_INFO(" sv_cmd moveplayer 2 spec \n"); - LOG_INFO("See also: ^2allspec, shuffleteams^7\n"); + LOG_INFO("Usage:^3 sv_cmd moveplayer clients destination"); + LOG_INFO(" 'clients' is a list (separated by commas) of player entity ID's or nicknames"); + LOG_INFO(" 'destination' is what to send the player to, be it team or spectating"); + LOG_INFO(" Full list of destinations here: \"spec, spectator, red, blue, yellow, pink, auto.\""); + LOG_INFO("Examples: sv_cmd moveplayer 1,3,5 red 3"); + LOG_INFO(" sv_cmd moveplayer 2 spec "); + LOG_INFO("See also: ^2allspec, shuffleteams^7"); return; } } @@ -1127,13 +1145,13 @@ void GameCommand_nospectators(float request) { blockSpectators = 1; // give every spectator seconds time to become a player - FOREACH_CLIENT(IS_REAL_CLIENT(it) && (IS_SPEC(it) || IS_OBSERVER(it)) && !it.caplayer, LAMBDA( + FOREACH_CLIENT(IS_REAL_CLIENT(it) && (IS_SPEC(it) || IS_OBSERVER(it)) && !it.caplayer, { if(!it.caplayer) { - it.spectatortime = time; + CS(it).spectatortime = time; Send_Notification(NOTIF_ONE_ONLY, it, 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; } @@ -1141,8 +1159,8 @@ void GameCommand_nospectators(float request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd nospectators\n"); - LOG_INFO(" No arguments required.\n"); + LOG_INFO("Usage:^3 sv_cmd nospectators"); + LOG_INFO(" No arguments required."); return; } } @@ -1168,7 +1186,7 @@ void GameCommand_playerdemo(float request, float argc) if (accepted <= 0) { - LOG_INFO("playerdemo: read: ", GetClientErrorString(accepted, argv(2)), ".\n"); + LOG_INFO("playerdemo: read: ", GetClientErrorString(accepted, argv(2)), "."); return; } @@ -1183,7 +1201,7 @@ void GameCommand_playerdemo(float request, float argc) if (accepted <= 0) { - LOG_INFO("playerdemo: write: ", GetClientErrorString(accepted, argv(2)), ".\n"); + LOG_INFO("playerdemo: write: ", GetClientErrorString(accepted, argv(2)), "."); return; } @@ -1218,11 +1236,11 @@ void GameCommand_playerdemo(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2playerdemo^7\n"); + LOG_INFO("Incorrect parameters for ^2playerdemo^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd playerdemo command (entitynumber filename | entitynumber botnumber)\n"); - LOG_INFO(" Full list of commands here: \"read, write, auto_read_and_write, auto_read.\"\n"); + LOG_INFO("Usage:^3 sv_cmd playerdemo command (entitynumber filename | entitynumber botnumber)"); + LOG_INFO(" Full list of commands here: \"read, write, auto_read_and_write, auto_read.\""); return; } } @@ -1235,15 +1253,15 @@ void GameCommand_printstats(float request) case CMD_REQUEST_COMMAND: { DumpStats(false); - LOG_INFO("stats dumped.\n"); + LOG_INFO("stats dumped."); return; } default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd printstats\n"); - LOG_INFO(" No arguments required.\n"); + LOG_INFO("Usage:^3 sv_cmd printstats"); + LOG_INFO(" No arguments required."); return; } } @@ -1259,13 +1277,13 @@ void GameCommand_radarmap(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2radarmap^7\n"); + LOG_INFO("Incorrect parameters for ^2radarmap^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd radarmap [--force] [--loop] [--quit] [--block | --trace | --sample | --lineblock] [--sharpen N] [--res W H] [--qual Q]\n"); - LOG_INFO(" The quality factor Q is roughly proportional to the time taken.\n"); - LOG_INFO(" trace supports no quality factor; its result should look like --block with infinite quality factor.\n"); - LOG_INFO("See also: ^2make_mapinfo^7\n"); + LOG_INFO("Usage:^3 sv_cmd radarmap [--force] [--loop] [--quit] [--block | --trace | --sample | --lineblock] [--sharpen N] [--res W H] [--qual Q]"); + LOG_INFO(" The quality factor Q is roughly proportional to the time taken."); + LOG_INFO(" trace supports no quality factor; its result should look like --block with infinite quality factor."); + LOG_INFO("See also: ^2make_mapinfo^7"); return; } } @@ -1284,9 +1302,9 @@ void GameCommand_reducematchtime(float request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd reducematchtime\n"); - LOG_INFO(" No arguments required.\n"); - LOG_INFO("See also: ^2extendmatchtime^7\n"); + LOG_INFO("Usage:^3 sv_cmd reducematchtime"); + LOG_INFO(" No arguments required."); + LOG_INFO("See also: ^2extendmatchtime^7"); return; } } @@ -1308,12 +1326,12 @@ void GameCommand_setbots(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2setbots^7\n"); + LOG_INFO("Incorrect parameters for ^2setbots^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd setbots botnumber\n"); - LOG_INFO(" Where 'botnumber' is the amount of bots to set bot_number cvar to.\n"); - LOG_INFO("See also: ^2bot_cmd^7\n"); + LOG_INFO("Usage:^3 sv_cmd setbots botnumber"); + LOG_INFO(" Where 'botnumber' is the amount of bots to set bot_number cvar to."); + LOG_INFO("See also: ^2bot_cmd^7"); return; } } @@ -1325,99 +1343,46 @@ void GameCommand_shuffleteams(float request) { case CMD_REQUEST_COMMAND: { - if (teamplay) - { - float x, t_teams, t_players, team_color; - - // count the total amount of players and total amount of teams - t_players = 0; - t_teams = 0; - FOREACH_CLIENT(IS_PLAYER(it) || it.caplayer, LAMBDA( - CheckAllowedTeams(it); - - 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 - FOREACH_CLIENT(IS_PLAYER(it) || it.caplayer, LAMBDA( - for ( ; ; ) - { - int idx = bound(1, floor(random() * maxclients) + 1, maxclients); - - if (shuffleteams_players[idx]) - { - continue; // a player is already assigned to this slot - } - else - { - shuffleteams_players[idx] = etof(it); - break; - } - } - )); - - // 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 = 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 (!(shuffleteams_players[z])) continue; // not a player, move on to next random slot - - entity e = NULL; - if(VerifyClientNumber(shuffleteams_players[z])) - e = edict_num(shuffleteams_players[z]); - - if(!e) continue; // unverified - - if (e.team != team_color) MoveToTeam(e, team_color, 6); - - shuffleteams_players[z] = 0; - shuffleteams_teams[i] = shuffleteams_teams[i] + 1; - } - else - { - break; // move on to next team - } - } - } - - bprint("Successfully shuffled the players around randomly.\n"); - - // clear the buffers now - for (int i = 0; i < SHUFFLETEAMS_MAX_PLAYERS; ++i) - shuffleteams_players[i] = 0; - - for (int i = 0; i < SHUFFLETEAMS_MAX_TEAMS; ++i) - shuffleteams_teams[i] = 0; - } - else + if (!teamplay) { - LOG_INFO("Can't shuffle teams when currently not playing a team game.\n"); + LOG_INFO("Can't shuffle teams when currently not playing a team game."); + return; } + FOREACH_CLIENT(IS_PLAYER(it) || it.caplayer, { + if (it.team_forced) { + // we could theoretically assign forced players to their teams + // and shuffle the rest to fill the empty spots but in practise + // either all players or none are gonna have forced teams + LOG_INFO("Can't shuffle teams because at least one player has a forced team."); + return; + } + }); + + int number_of_teams = 0; + CheckAllowedTeams(NULL); + if (c1 >= 0) number_of_teams = max(1, number_of_teams); + if (c2 >= 0) number_of_teams = max(2, number_of_teams); + if (c3 >= 0) number_of_teams = max(3, number_of_teams); + if (c4 >= 0) number_of_teams = max(4, number_of_teams); + + int team_index = 0; + FOREACH_CLIENT_RANDOM(IS_PLAYER(it) || it.caplayer, { + int target_team_number = Team_NumberToTeam(team_index + 1); + if (it.team != target_team_number) MoveToTeam(it, target_team_number, 6); + team_index = (team_index + 1) % number_of_teams; + }); + + bprint("Successfully shuffled the players around randomly.\n"); return; } default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd shuffleteams\n"); - LOG_INFO(" No arguments required.\n"); - LOG_INFO("See also: ^2moveplayer, allspec^7\n"); + LOG_INFO("Usage:^3 sv_cmd shuffleteams"); + LOG_INFO(" No arguments required."); + LOG_INFO("See also: ^2moveplayer, allspec^7"); return; } } @@ -1442,11 +1407,11 @@ void GameCommand_stuffto(float request, float argc) if (accepted > 0) { stuffcmd(client, strcat("\n", argv(next_token), "\n")); - LOG_INFO(strcat("Command: \"", argv(next_token), "\" sent to ", GetCallerName(client), " (", argv(1), ").\n")); + LOG_INFO("Command: \"", argv(next_token), "\" sent to ", GetCallerName(client), " (", argv(1), ")."); } else { - LOG_INFO("stuffto: ", GetClientErrorString(accepted, argv(1)), ".\n"); + LOG_INFO("stuffto: ", GetClientErrorString(accepted, argv(1)), "."); } return; @@ -1454,19 +1419,19 @@ void GameCommand_stuffto(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2stuffto^7\n"); + LOG_INFO("Incorrect parameters for ^2stuffto^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd stuffto client \"command\"\n"); - LOG_INFO(" 'client' is the entity number or name of the player,\n"); - LOG_INFO(" and 'command' is the command to be sent to that player.\n"); + LOG_INFO("Usage:^3 sv_cmd stuffto client \"command\""); + LOG_INFO(" 'client' is the entity number or name of the player,"); + LOG_INFO(" and 'command' is the command to be sent to that player."); return; } } #else if (request) { - LOG_INFO("stuffto command is not enabled on this server.\n"); + LOG_INFO("stuffto command is not enabled on this server."); return; } #endif @@ -1487,7 +1452,7 @@ void GameCommand_trace(float request, float argc) case "debug": { float hitcount = 0; - LOG_INFO("TEST CASE. If this returns the runaway loop counter error, possibly everything is oaky.\n"); + LOG_INFO("TEST CASE. If this returns the runaway loop counter error, possibly everything is oaky."); float worst_endpos_bug = 0; for ( ; ; ) { @@ -1505,15 +1470,15 @@ void GameCommand_trace(float request, float argc) start = stov(vtos(start)); end = stov(vtos(end)); - tracebox(start, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), end, MOVE_NOMONSTERS, NULL); + tracebox(start, PL_MIN_CONST, PL_MAX_CONST, end, MOVE_NOMONSTERS, NULL); if (!trace_startsolid && trace_fraction < 1) { p = trace_endpos; - tracebox(p, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), p, MOVE_NOMONSTERS, NULL); + tracebox(p, PL_MIN_CONST, PL_MAX_CONST, p, MOVE_NOMONSTERS, NULL); if (trace_startsolid) { rint(42); // do an engine breakpoint on VM_rint so you can get the trace that errnoeously returns startsolid - tracebox(start, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), end, MOVE_NOMONSTERS, NULL); + tracebox(start, PL_MIN_CONST, PL_MAX_CONST, end, MOVE_NOMONSTERS, NULL); // how much do we need to back off? safe = 1; @@ -1521,7 +1486,7 @@ void GameCommand_trace(float request, float argc) for ( ; ; ) { pos = p * (1 - (safe + unsafe) * 0.5) + start * ((safe + unsafe) * 0.5); - tracebox(pos, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), pos, MOVE_NOMONSTERS, NULL); + tracebox(pos, PL_MIN_CONST, PL_MAX_CONST, pos, MOVE_NOMONSTERS, NULL); if (trace_startsolid) { if ((safe + unsafe) * 0.5 == unsafe) break; @@ -1534,12 +1499,12 @@ void GameCommand_trace(float request, float argc) } } - LOG_INFO("safe distance to back off: ", ftos(safe * vlen(p - start)), "qu\n"); - LOG_INFO("unsafe distance to back off: ", ftos(unsafe * vlen(p - start)), "qu\n"); + LOG_INFO("safe distance to back off: ", ftos(safe * vlen(p - start)), "qu"); + LOG_INFO("unsafe distance to back off: ", ftos(unsafe * vlen(p - start)), "qu"); - tracebox(p, STAT(PL_MIN, NULL) + '0.1 0.1 0.1', STAT(PL_MAX, NULL) - '0.1 0.1 0.1', p, MOVE_NOMONSTERS, NULL); - if (trace_startsolid) LOG_INFO("trace_endpos much in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n"); - else LOG_INFO("trace_endpos just in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n"); + tracebox(p, PL_MIN_CONST + '0.1 0.1 0.1', PL_MAX_CONST - '0.1 0.1 0.1', p, MOVE_NOMONSTERS, NULL); + if (trace_startsolid) LOG_INFO("trace_endpos much in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p)); + else LOG_INFO("trace_endpos just in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p)); if (++hitcount >= 10) break; } else @@ -1551,7 +1516,7 @@ void GameCommand_trace(float request, float argc) { q = p + normalize(end - p) * (dq + dqf); if (q == q0) break; - tracebox(p, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), q, MOVE_NOMONSTERS, NULL); + tracebox(p, PL_MIN_CONST, PL_MAX_CONST, q, MOVE_NOMONSTERS, NULL); if (trace_startsolid) error("THIS ONE cannot happen"); if (trace_fraction > 0) dq += dqf * trace_fraction; dqf *= 0.5; @@ -1560,8 +1525,8 @@ void GameCommand_trace(float request, float argc) if (dq > worst_endpos_bug) { worst_endpos_bug = dq; - LOG_INFO("trace_endpos still before solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n"); - LOG_INFO("could go ", ftos(dq), " units further to ", vtos(q), "\n"); + LOG_INFO("trace_endpos still before solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p)); + LOG_INFO("could go ", ftos(dq), " units further to ", vtos(q)); if (++hitcount >= 10) break; } } @@ -1577,7 +1542,7 @@ void GameCommand_trace(float request, float argc) vv = trace_endpos; if (trace_fraction == 1) { - LOG_INFO("not above ground, aborting\n"); + LOG_INFO("not above ground, aborting"); return; } f = 0; @@ -1586,28 +1551,30 @@ void GameCommand_trace(float request, float argc) dv = randomvec(); if (dv.z > 0) dv = -1 * dv; tracebox(vv, e.mins, e.maxs, vv + dv, MOVE_NORMAL, e); - if (trace_startsolid) LOG_INFO("bug 1\n"); + if (trace_startsolid) LOG_INFO("bug 1"); if (trace_fraction == 1) { if (dv.z < f) { LOG_INFO("bug 2: ", ftos(dv.x), " ", ftos(dv.y), " ", ftos(dv.z)); - LOG_INFO(" (", ftos(asin(dv.z / vlen(dv)) * 180 / M_PI), " degrees)\n"); + LOG_INFO(" (", ftos(asin(dv.z / vlen(dv)) * 180 / M_PI), " degrees)"); f = dv.z; } } } - LOG_INFO("highest possible dist: ", ftos(f), "\n"); + LOG_INFO("highest possible dist: ", ftos(f)); return; } case "walk": { - if (argc == 4) + if (argc == 4 || argc == 5) { e = nextent(NULL); - if (tracewalk(e, stov(argv(2)), e.mins, e.maxs, stov(argv(3)), MOVE_NORMAL)) LOG_INFO("can walk\n"); - else LOG_INFO("cannot walk\n"); + if (tracewalk(e, stov(argv(2)), e.mins, e.maxs, stov(argv(3)), stof(argv(4)), MOVE_NORMAL)) + LOG_INFO("can walk"); + else + LOG_INFO("cannot walk"); return; } } @@ -1630,12 +1597,14 @@ void GameCommand_trace(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2trace^7\n"); + LOG_INFO("Incorrect parameters for ^2trace^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd trace command (startpos endpos)\n"); - LOG_INFO(" Full list of commands here: \"debug, debug2, walk, showline.\"\n"); - LOG_INFO("See also: ^2bbox, gettaginfo^7\n"); + LOG_INFO("Usage:^3 sv_cmd trace command [startpos endpos] [endpos_height]"); + LOG_INFO(" Where startpos and endpos are parameters for 'walk' and 'showline' commands,"); + LOG_INFO(" 'endpos_height' is an optional parameter for 'walk' command,"); + LOG_INFO(" Full list of commands here: \"debug, debug2, walk, showline.\""); + LOG_INFO("See also: ^2bbox, gettaginfo^7"); return; } } @@ -1662,9 +1631,9 @@ void GameCommand_unlockteams(float request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd unlockteams\n"); - LOG_INFO(" No arguments required.\n"); - LOG_INFO("See also: ^2lockteams^7\n"); + LOG_INFO("Usage:^3 sv_cmd unlockteams"); + LOG_INFO(" No arguments required."); + LOG_INFO("See also: ^2lockteams^7"); return; } } @@ -1681,17 +1650,17 @@ void GameCommand_warp(float request, float argc) if (argc >= 2) { CampaignLevelWarp(stof(argv(1))); - LOG_INFO("Successfully warped to campaign level ", argv(1), ".\n"); + LOG_INFO("Successfully warped to campaign level ", argv(1), "."); } else { CampaignLevelWarp(-1); - LOG_INFO("Successfully warped to next campaign level.\n"); + LOG_INFO("Successfully warped to next campaign level."); } } else { - LOG_INFO("Not in campaign, can't level warp\n"); + LOG_INFO("Not in campaign, can't level warp"); } return; } @@ -1699,9 +1668,9 @@ void GameCommand_warp(float request, float argc) default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 sv_cmd warp [level]\n"); - LOG_INFO(" 'level' is the level to change campaign mode to.\n"); - LOG_INFO(" if 'level' is not provided it will change to the next level.\n"); + LOG_INFO("Usage:^3 sv_cmd warp [level]"); + LOG_INFO(" 'level' is the level to change campaign mode to."); + LOG_INFO(" if 'level' is not provided it will change to the next level."); return; } } @@ -1770,32 +1739,32 @@ SERVER_COMMAND(warp, "Choose different level in campaign") { GameCommand_warp(re void GameCommand_macro_help() { - FOREACH(SERVER_COMMANDS, true, LAMBDA(LOG_INFOF(" ^2%s^7: %s\n", it.m_name, it.m_description))); + FOREACH(SERVER_COMMANDS, true, { LOG_INFOF(" ^2%s^7: %s", it.m_name, it.m_description); }); } float GameCommand_macro_command(float argc, string command) { string c = strtolower(argv(0)); - FOREACH(SERVER_COMMANDS, it.m_name == c, LAMBDA( + FOREACH(SERVER_COMMANDS, it.m_name == c, { it.m_invokecmd(it, CMD_REQUEST_COMMAND, NULL, argc, command); return true; - )); + }); return false; } float GameCommand_macro_usage(float argc) { string c = strtolower(argv(1)); - FOREACH(SERVER_COMMANDS, it.m_name == c, LAMBDA( + FOREACH(SERVER_COMMANDS, it.m_name == c, { it.m_invokecmd(it, CMD_REQUEST_USAGE, NULL, argc, ""); return true; - )); + }); return false; } void GameCommand_macro_write_aliases(float fh) { - FOREACH(SERVER_COMMANDS, true, LAMBDA(CMD_Write_Alias("qc_cmd_sv", it.m_name, it.m_description))); + FOREACH(SERVER_COMMANDS, true, { CMD_Write_Alias("qc_cmd_sv", it.m_name, it.m_description); }); } @@ -1817,20 +1786,22 @@ void GameCommand(string command) { if (argc == 1) { - LOG_INFO("\nServer console commands:\n"); + LOG_INFO("Server console commands:"); GameCommand_macro_help(); - LOG_INFO("\nBanning commands:\n"); + LOG_INFO("\nBanning commands:"); BanCommand_macro_help(); - LOG_INFO("\nCommon networked commands:\n"); + LOG_INFO("\nCommon networked commands:"); CommonCommand_macro_help(NULL); - LOG_INFO("\nGeneric commands shared by all programs:\n"); + LOG_INFO("\nGeneric commands shared by all programs:"); GenericCommand_macro_help(); - LOG_INFO("\nUsage:^3 sv_cmd COMMAND...^7, where possible commands are listed above.\n"); - LOG_INFO("For help about a specific command, type sv_cmd help COMMAND\n"); + LOG_INFO( + "\nUsage:^3 sv_cmd COMMAND...^7, where possible commands are listed above.\n" + "For help about a specific command, type sv_cmd help COMMAND" + ); return; } @@ -1873,5 +1844,5 @@ void GameCommand(string command) } // nothing above caught the command, must be invalid - LOG_INFO(((command != "") ? strcat("Unknown server command \"", command, "\"") : "No command provided"), ". For a list of supported commands, try sv_cmd help.\n"); + LOG_INFO(((command != "") ? strcat("Unknown server command \"", command, "\"") : "No command provided"), ". For a list of supported commands, try sv_cmd help."); }