X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fsv_cmd.qc;h=3a776f05472531a06815c4012d9b3df4a2c6081d;hb=13832240e226eba119844d7bd02ca51b617e586a;hp=49bee362e7481fdc8deb171de0c440ed88f4a2f5;hpb=e57fd111a3279a4aa4789e2c72f9c819a56c7be9;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index 49bee362e..3a776f054 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -20,7 +20,8 @@ #include "../bot/api.qh" -#include "../mutators/_mod.qh" +#include +#include #include #include @@ -31,19 +32,12 @@ #include - -void PutObserverInServer(entity this); - -// ===================================================== -// Server side game commands code, reworked by Samual -// ===================================================== - // used by GameCommand_make_mapinfo() 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); } @@ -125,7 +119,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; } @@ -146,22 +140,22 @@ void GameCommand_adminmsg(float request, float argc) } 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; } } @@ -180,8 +174,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; } } @@ -201,16 +195,16 @@ void GameCommand_allspec(float request, float argc) ++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; } } @@ -232,16 +226,16 @@ void GameCommand_anticheat(float request, float argc) } 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; } } @@ -303,18 +297,18 @@ void GameCommand_bbox(float request) NULL); size_max.z = (trace_startsolid) ? world.absmax.z : trace_endpos.z; - LOG_INFOF("Original size: %v %v\n", world.absmin, world.absmax); - LOG_INFOF("Currently set size: %v %v\n", world.mins, world.maxs); - LOG_INFOF("Solid bounding box size: %v %v\n", size_min, size_max); + 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; } } @@ -340,7 +334,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) @@ -350,7 +344,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; } @@ -372,7 +366,7 @@ 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 { @@ -395,7 +389,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; } @@ -415,7 +409,7 @@ void GameCommand_bot_cmd(float request, float argc, string command) bot_num++; }); if(bot_num) - LOG_INFO(strcat("Command '", substring(command, argv_start_index(2), -1), "' sent to all bots (", ftos(bot_num), ")\n")); + LOG_INFO("Command '", substring(command, argv_start_index(2), -1), "' sent to all bots (", ftos(bot_num), ")"); return; } else @@ -424,29 +418,29 @@ void GameCommand_bot_cmd(float request, float argc, string command) if (bot == NULL) bot = find_bot_by_name(argv(1)); if (bot) { - LOG_INFO(strcat("Command '", substring(command, argv_start_index(2), -1), "' sent to bot ", bot.netname, "\n")); + 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(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 + 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 of the bot or a progressive number (not the entity number!)\n"); - LOG_INFO(" can also be '*' or 'all' to allow sending the command to all the bots\n"); - LOG_INFO(" For full list of commands, see bot_cmd help [command].\n"); - LOG_INFO("Examples: sv_cmd bot_cmd 1 cc \"say something\"\n"); - LOG_INFO(" sv_cmd bot_cmd 1 presskey jump\n"); - LOG_INFO(" sv_cmd bot_cmd * pause\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; } } @@ -469,8 +463,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; } } @@ -487,33 +481,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; } } @@ -536,21 +530,21 @@ void GameCommand_defer_clear(float request, float argc) if (accepted > 0) { stuffcmd(client, "defer clear\n"); - LOG_INFO("defer clear stuffed to ", playername(client, false), "\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; } } @@ -570,16 +564,16 @@ void GameCommand_defer_clear_all(float request) 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; } } @@ -600,13 +594,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; } } @@ -622,79 +616,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))) @@ -705,12 +699,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; @@ -719,8 +713,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; } } @@ -739,9 +733,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; } } @@ -786,12 +780,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; } } @@ -826,13 +820,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; @@ -841,7 +837,7 @@ void GameCommand_gettaginfo(float request, float argc) } else { - LOG_INFO("bone not found\n"); + LOG_INFO("bone not found"); } delete(tmp_entity); @@ -850,11 +846,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; } } @@ -900,8 +896,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; @@ -909,11 +905,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; } } @@ -927,18 +923,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; } } @@ -965,9 +961,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; } } @@ -991,9 +987,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; } } @@ -1029,7 +1025,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; } @@ -1045,7 +1041,7 @@ void GameCommand_moveplayer(float request, float argc) } else { - LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") is already spectating.\n"); + LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") is already spectating."); } continue; } @@ -1062,74 +1058,123 @@ void GameCommand_moveplayer(float request, float argc) // find the team to move the player to team_id = Team_ColorToTeam(destination); + entity balance; if (team_id == client.team) // already on the destination team { // keep the forcing undone - 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.\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 { - CheckAllowedTeams(client); - team_id = Team_NumberToTeam(FindSmallestTeam(client, false)); + balance = TeamBalance_CheckAllowedTeams(client); + team_id = Team_IndexToTeam(TeamBalance_FindBestTeam(balance, client, false)); } else { - CheckAllowedTeams(client); + balance = TeamBalance_CheckAllowedTeams(client); } client.team_forced = save; // 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; - - default: LOG_INFO("Sorry, can't move player here if team ", destination, " doesn't exist.\n"); + case NUM_TEAM_1: + { + if (!TeamBalance_IsTeamAllowed(balance, 1)) + { + LOG_INFO("Sorry, can't move player to red team if it doesn't exist."); + TeamBalance_Destroy(balance); + return; + } + TeamBalance_Destroy(balance); + break; + } + case NUM_TEAM_2: + { + if (!TeamBalance_IsTeamAllowed(balance, 2)) + { + LOG_INFO("Sorry, can't move player to blue team if it doesn't exist."); + TeamBalance_Destroy(balance); + return; + } + TeamBalance_Destroy(balance); + break; + } + case NUM_TEAM_3: + { + if (!TeamBalance_IsTeamAllowed(balance, 3)) + { + LOG_INFO("Sorry, can't move player to yellow team if it doesn't exist."); + TeamBalance_Destroy(balance); + return; + } + TeamBalance_Destroy(balance); + break; + } + case NUM_TEAM_4: + { + if (!TeamBalance_IsTeamAllowed(balance, 4)) + { + LOG_INFO("Sorry, can't move player to pink team if it doesn't exist."); + TeamBalance_Destroy(balance); + return; + } + TeamBalance_Destroy(balance); + break; + } + 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 ? ", " : ""), playername(client, false)); - LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") has been moved to the ", Team_ColoredFullName(team_id), "^7.\n"); + if (MoveToTeam(client, Team_TeamToIndex(team_id), 6)) + { + 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."); + } + else + { + LOG_INFO("Unable to move player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ")"); + } 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; } } @@ -1157,8 +1202,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; } } @@ -1184,7 +1229,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; } @@ -1199,7 +1244,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; } @@ -1234,11 +1279,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; } } @@ -1251,15 +1296,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; } } @@ -1275,13 +1320,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; } } @@ -1300,9 +1345,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; } } @@ -1324,12 +1369,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; } } @@ -1343,7 +1388,7 @@ void GameCommand_shuffleteams(float request) { 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; } @@ -1352,22 +1397,29 @@ void GameCommand_shuffleteams(float request) // 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.\n"); + 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); + entity balance = TeamBalance_CheckAllowedTeams(NULL); + for (int i = 1; i <= NUM_TEAMS; ++i) + { + if (TeamBalance_IsTeamAllowed(balance, i)) + { + number_of_teams = max(i, number_of_teams); + } + } + TeamBalance_Destroy(balance); 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); + int target_team_index = team_index + 1; + if (Entity_GetTeamIndex(it) != target_team_index) + { + MoveToTeam(it, target_team_index, 6); + } team_index = (team_index + 1) % number_of_teams; }); @@ -1378,9 +1430,9 @@ void GameCommand_shuffleteams(float request) 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; } } @@ -1405,11 +1457,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; @@ -1417,19 +1469,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 @@ -1450,7 +1502,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 ( ; ; ) { @@ -1497,12 +1549,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, 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), "\n"); - else LOG_INFO("trace_endpos just in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n"); + 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 @@ -1523,8 +1575,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; } } @@ -1540,7 +1592,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; @@ -1549,28 +1601,33 @@ 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"); + int dphitcontentsmask_save = e.dphitcontentsmask; + e.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP | DPCONTENTS_BOTCLIP; + 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"); + e.dphitcontentsmask = dphitcontentsmask_save; return; } } @@ -1593,12 +1650,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; } } @@ -1625,9 +1684,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; } } @@ -1644,17 +1703,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; } @@ -1662,9 +1721,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; } } @@ -1733,7 +1792,7 @@ SERVER_COMMAND(warp, "Choose different level in campaign") { GameCommand_warp(re void GameCommand_macro_help() { - FOREACH(SERVER_COMMANDS, true, { 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) @@ -1780,20 +1839,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; } @@ -1836,5 +1897,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."); }