X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fgamecommand.qc;h=f5b662be35e51a5e6a80a72a6ca70ac800cdaaa7;hb=a4507f589e7a11838a63576e69b5789cb97d6815;hp=a8537a0ae88c93cb92cf845f5463fd389abc0c10;hpb=c6b0bfd9440e9baad268f9409ec6de5c3d56d06f;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/gamecommand.qc b/qcsrc/server/gamecommand.qc index a8537a0ae..f5b662be3 100644 --- a/qcsrc/server/gamecommand.qc +++ b/qcsrc/server/gamecommand.qc @@ -385,7 +385,7 @@ void RadarMap_Think() else { // close the file - fputs(self.cnt, "};\n"); + fputs(self.cnt, "}\n"); fclose(self.cnt); print("Finished. Please edit data/", self.netname, " with an image editing application and place it in the TGA format in the gfx folder.\n"); RadarMap_Next(); @@ -854,7 +854,7 @@ void GameCommand(string command) if (argv(0) == "nospectators") { blockSpectators = 1; - local entity plr; + entity plr; FOR_EACH_CLIENT(plr) //give every spectator seconds time to become a player { if(plr.classname == "spectator" || plr.classname == "observer") @@ -1259,7 +1259,7 @@ void GameCommand(string command) if(argv(0) == "bot_cmd") { - local entity bot; + entity bot; if(argv(1) == "help") { @@ -1283,6 +1283,17 @@ void GameCommand(string command) return; } + // set bot count + if(argv(1) == "setbots") + { + if(argc >= 3 && argv(1) == "setbots") + { + cvar_settemp("minplayers", "0"); + cvar_settemp("bot_number", argv(2)); + bot_fixcount(); + } + } + // Load cmds from file if(argv(1) == "load" && argc == 3) { @@ -1301,12 +1312,26 @@ void GameCommand(string command) if(argc >= 3 && argv(0) == "sv_cmd" && argv(1) == "bot_cmd") { - // let's start at token 2 so we can skip sv_cmd bot_cmd - bot = find_bot_by_number(stof(argv(2))); - if(bot == world) - bot = find_bot_by_name(argv(2)); - if(bot) - bot_queuecommand(bot, strcat(argv(3), " ", argv(4))); + if(argv(2) == "reset") + { + bot_resetqueues(); + } + else if(argv(2) == "setbots") + { + cvar_settemp("minplayers", "0"); + cvar_settemp("bot_number", argv(3)); + if(!bot_fixcount()) + print("Sorry, could not set requested bot count\n"); + } + 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 == world) + bot = find_bot_by_name(argv(2)); + if(bot) + bot_queuecommand(bot, strcat(argv(3), " ", argv(4))); + } } else localcmd(strcat(s, "\n"));