// =====================================================
// Server side game commands code, reworked by Samual
-// Last updated: December 6th, 2011
+// Last updated: December 28th, 2011
// =====================================================
// used by GameCommand_make_mapinfo()
cvar_set("timelimit", ftos(new / 60));
}
-// used by GameCommand_modelbug() // Samual: is this even needed?
-float g_clientmodel_genericsendentity (entity to, float sf);
-void modelbug_make_svqc();
-void modelbug_make_csqc()
-{
- Net_LinkEntity(self, TRUE, 0, g_clientmodel_genericsendentity);
- self.think = modelbug_make_svqc;
- self.nextthink = time + 1;
- setorigin(self, self.origin - '0 0 8');
-}
-void modelbug_make_svqc()
-{
- self.SendEntity = func_null;
- self.think = modelbug_make_csqc;
- self.nextthink = time + 1;
- setorigin(self, self.origin + '0 0 8');
-}
-void modelbug()
-{
- entity e;
- e = spawn();
- setorigin(e, nextent(world).origin);
- precache_model("models_portal.md3");
- setmodel(e, "models/portal.md3");
- e.think = modelbug_make_svqc;
- e.nextthink = time + 1;
-}
-
// =======================
// Command Sub-Functions
client = GetFilteredEntity(t);
accepted = VerifyClientEntity(client, TRUE, FALSE);
- if not(accepted)
+ if not(accepted > 0)
{
print("adminmsg: ", GetClientErrorString(accepted, t), (targets ? ", skipping to next player.\n" : ".\n"));
continue;
}
}
-void GameCommand_anticheat(float request, float argc)
+void GameCommand_anticheat(float request, float argc)
{
switch(request)
{
case CMD_REQUEST_COMMAND:
{
- entity client;
- float entno = stof(argv(1));
+ entity client = GetFilteredEntity(argv(1));
+ float accepted = VerifyClientEntity(client, FALSE, FALSE);
- if((entno < 1) | (entno > maxclients)) {
- print("Player ", argv(1), " doesn't exist\n");
+ if(accepted > 0)
+ {
+ self = client;
+ anticheat_report();
return;
}
- client = edict_num(entno);
- if(clienttype(client) != CLIENTTYPE_REAL || clienttype(client) != CLIENTTYPE_BOT) {
- print("Player ", client.netname, " is not active\n");
- return;
+ else
+ {
+ print("anticheat: ", GetClientErrorString(accepted, argv(1)), ".\n");
}
- self = client;
- anticheat_report();
- return;
}
default:
}
}
-void GameCommand_bbox(float request)
+void GameCommand_bbox(float request) // legacy
{
switch(request)
{
}
}
-void GameCommand_bot_cmd(float request, float argc) // what a mess... old old code.
+void GameCommand_bot_cmd(float request, float argc) // mostly legacy
{
switch(request)
{
print("\nUsage:^3 sv_cmd bot_cmd client command [argument]\n");
print(" 'client' can be either the name or entity id of the bot\n");
print(" For full list of commands, see bot_cmd help [command].\n");
- print("Examples: bot_cmd <id> cc \"say something\"\n");
- print(" bot_cmd <id> presskey jump\n");
+ print("Examples: sv_cmd bot_cmd client cc \"say something\"\n");
+ print(" sv_cmd bot_cmd client presskey jump\n");
return;
}
}
}
}
-void GameCommand_database(float request, float argc)
+void GameCommand_database(float request, float argc) // legacy
{
switch(request)
{
client = GetFilteredEntity(argv(1));
accepted = VerifyClientEntity(client, TRUE, FALSE);
- if(accepted)
+ if(accepted > 0)
{
stuffcmd(client, "defer clear\n");
print("defer clear stuffed to ", argv(1), " (", client.netname, ")\n");
}
}
-void GameCommand_delrec(float request, float argc) // UNTESTED // perhaps merge later with records and printstats and such?
+void GameCommand_delrec(float request, float argc) // legacy // perhaps merge later with records and printstats and such?
{
switch(request)
{
}
}
-void GameCommand_effectindexdump(float request)
+void GameCommand_effectindexdump(float request) // legacy
{
switch(request)
{
}
}
-void GameCommand_extendmatchtime(float request)
+void GameCommand_extendmatchtime(float request) // legacy
{
switch(request)
{
case CMD_REQUEST_COMMAND:
{
- changematchtime(autocvar_timelimit_increment* 60, autocvar_timelimit_min*60, autocvar_timelimit_max*60);
+ changematchtime(autocvar_timelimit_increment * 60, autocvar_timelimit_min * 60, autocvar_timelimit_max * 60);
return;
}
}
}
-void GameCommand_find(float request, float argc)
+void GameCommand_find(float request, float argc) // legacy // is this even needed? We have prvm_edicts command and such ANYWAY
{
switch(request)
{
}
}
-void GameCommand_gametype(float request, float argc)
+void GameCommand_gametype(float request, float argc) // legacy
{
switch(request)
{
}
}
-void GameCommand_gettaginfo(float request, float argc) // UNTESTED
+void GameCommand_gettaginfo(float request, float argc) // legacy
{
switch(request)
{
}
}
-void GameCommand_gotomap(float request, float argc)
+void GameCommand_gotomap(float request, float argc) // mostly legacy
{
switch(request)
{
case CMD_REQUEST_COMMAND:
{
- if(argc == 2)
+ if(argv(1))
{
print(GotoMap(argv(1)), "\n");
return;
}
}
-void GameCommand_make_mapinfo(float request) // UNTESTED
+void GameCommand_make_mapinfo(float request) // legacy
{
switch(request)
{
}
}
-void GameCommand_modelbug(float request) // UNTESTED // is this even needed anymore?
-{
- switch(request)
- {
- case CMD_REQUEST_COMMAND:
- {
- modelbug();
- return;
- }
-
- default:
- case CMD_REQUEST_USAGE:
- {
- print("\nUsage:^3 sv_cmd modelbug\n");
- print(" No arguments required.\n");
- return;
- }
- }
-}
-
void GameCommand_moveplayer(float request, float argc)
{
switch(request)
// Check to see if the player is a valid target
client = GetFilteredEntity(t);
- accepted = VerifyClientEntity(client, FALSE, TRUE);
+ accepted = VerifyClientEntity(client, FALSE, FALSE);
- if not(accepted)
+ if not(accepted > 0)
{
print("moveplayer: ", GetClientErrorString(accepted, t), (targets ? ", skipping to next player.\n" : ".\n"));
continue;
print(" 'notify' is whether or not to send messages notifying of the move. Detail below.\n");
print(" 0 (00) automove centerprint, admin message; 1 (01) automove centerprint, no admin message\n");
print(" 2 (10) no centerprint, admin message; 3 (11) no centerprint, no admin message\n");
- print("Examples: moveplayer 1,3,5 red 3\n");
- print(" moveplayer 2 spec \n");
+ print("Examples: sv_cmd moveplayer 1,3,5 red 3\n");
+ print(" sv_cmd moveplayer 2 spec \n");
print("See also: ^2allspec, shuffleteams^7\n");
return;
}
}
}
-void GameCommand_nospectators(float request)
+void GameCommand_nospectators(float request) // legacy
{
switch(request)
{
}
}
-void GameCommand_onslaught_updatelinks(float request) // UNTESTED // should this be here? Perhaps some mutatorhook call instead....
-{
- switch(request)
- {
- case CMD_REQUEST_COMMAND:
- {
- onslaught_updatelinks();
- print("ONS links updated\n");
- return;
- }
-
- default:
- case CMD_REQUEST_USAGE:
- {
- print("\nUsage:^3 sv_cmd onslaught_updatelinks\n");
- print(" No arguments required.\n");
- return;
- }
- }
-}
-
-void GameCommand_playerdemo(float request, float argc) // UNTESTED
+void GameCommand_playerdemo(float request, float argc) // mostly legacy
{
switch(request)
{
case CMD_REQUEST_COMMAND:
{
- entity client;
- float i, n, entno;
- string s;
-
- switch(argv(1))
+ if(argv(2) && argv(3))
{
- case "read":
+ entity client;
+ float i, n, accepted;
+
+ switch(argv(1))
{
- // TODO: Create a general command for looking this up, save a lot of space everywhere in this file
- entno = GetFilteredNumber(argv(2));
- if((entno < 1) | (entno > maxclients)) {
- print("Player ", argv(2), " doesn't exist\n");
+ case "read":
+ {
+ client = GetFilteredEntity(argv(2));
+ accepted = VerifyClientEntity(client, FALSE, TRUE);
+
+ if not(accepted > 0)
+ {
+ print("playerdemo: read: ", GetClientErrorString(accepted, argv(2)), ".\n");
+ return;
+ }
+
+ self = client;
+ playerdemo_open_read(argv(3));
return;
}
- client = edict_num(entno);
- if(clienttype(client) != CLIENTTYPE_BOT) {
- print("Player ", client.netname, " is not a bot\n");
+
+ case "write":
+ {
+ client = GetFilteredEntity(argv(2));
+ accepted = VerifyClientEntity(client, FALSE, FALSE);
+
+ if not(accepted > 0)
+ {
+ print("playerdemo: write: ", GetClientErrorString(accepted, argv(2)), ".\n");
+ return;
+ }
+
+ self = client;
+ playerdemo_open_write(argv(3));
return;
}
- self = client;
- playerdemo_open_read(argv(3));
- return;
- }
-
- case "write":
- {
- entno = GetFilteredNumber(argv(2));
- if((entno < 1) | (entno > maxclients)) {
- print("Player ", argv(2), " doesn't exist\n");
+
+ case "auto_read_and_write":
+ {
+ n = GetFilteredNumber(argv(3));
+ cvar_set("bot_number", ftos(n));
+
+ localcmd("wait; wait; wait\n");
+ for(i = 0; i < n; ++i) { localcmd("sv_cmd playerdemo read ", ftos(i+2), " ", argv(2), ftos(i+1), "\n"); }
+
+ localcmd("sv_cmd playerdemo write 1 ", ftos(n+1), "\n");
+ return;
+ }
+
+ case "auto_read":
+ {
+ n = GetFilteredNumber(argv(3));
+ cvar_set("bot_number", ftos(n));
+
+ localcmd("wait; wait; wait\n");
+ for(i = 0; i < n; ++i) { localcmd("sv_cmd playerdemo read ", ftos(i+2), " ", argv(2), ftos(i+1), "\n"); }
return;
}
- client = edict_num(entno);
- self = client;
- playerdemo_open_write(argv(3));
- return;
- }
-
- case "auto_read_and_write":
- {
- s = argv(2);
- n = GetFilteredNumber(argv(3));
- cvar_set("bot_number", ftos(n));
- localcmd("wait; wait; wait\n");
- for(i = 0; i < n; ++i)
- localcmd("sv_cmd playerdemo read ", ftos(i+2), " ", s, ftos(i+1), "\n");
- localcmd("sv_cmd playerdemo write 1 ", ftos(n+1), "\n");
- return;
- }
-
- case "auto_read":
- {
- s = argv(2);
- n = GetFilteredNumber(argv(3));
- cvar_set("bot_number", ftos(n));
- localcmd("wait; wait; wait\n");
- for(i = 0; i < n; ++i)
- localcmd("sv_cmd playerdemo read ", ftos(i+2), " ", s, ftos(i+1), "\n");
- return;
}
-
- return;
}
}
default:
- print("Incorrect parameters for ^2radarmap^7\n");
+ print("Incorrect parameters for ^2playerdemo^7\n");
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 sv_cmd \n");
- print(" TODO: Arguments currently unknown\n");
+ print("\nUsage:^3 sv_cmd playerdemo command (entitynumber filename | entitynumber botnumber)\n");
+ print(" Full list of commands here: \"read, write, auto_read_and_write, auto_read.\"\n");
return;
}
}
}
-void GameCommand_printstats(float request)
+void GameCommand_printstats(float request) // legacy
{
switch(request)
{
}
}
-void GameCommand_reducematchtime(float request)
+void GameCommand_reducematchtime(float request) // legacy
{
switch(request)
{
case CMD_REQUEST_COMMAND:
{
- changematchtime(autocvar_timelimit_decrement*-60, autocvar_timelimit_min*60, autocvar_timelimit_max*60);
+ changematchtime(autocvar_timelimit_decrement *-60, autocvar_timelimit_min * 60, autocvar_timelimit_max * 60);
return;
}
{
case CMD_REQUEST_COMMAND:
{
- entity client;
- float entno;
-
- if(argc == 3)
+ if(argv(2))
{
- entno = GetFilteredNumber(argv(1));
- client = world;
- if(entno <= maxclients)
- client = edict_num(entno);
- if(client.flags & FL_CLIENT)
+ entity client = GetFilteredEntity(argv(1));
+ float accepted = VerifyClientEntity(client, TRUE, FALSE);
+
+ if(accepted > 0)
{
stuffcmd(client, strcat("\n", argv(2), "\n"));
- print(strcat("Command: \"", argv(2), "\" sent to ", client.netname, " (", argv(1) ,").\n"));
+ print(strcat("Command: \"", argv(2), "\" sent to ", GetCallerName(client), " (", argv(1) ,").\n"));
}
else
- print(strcat("Client (", argv(1) ,") not found.\n"));
+ print("stuffto: ", GetClientErrorString(accepted, argv(1)), ".\n");
return;
}
print("Incorrect parameters for ^2stuffto^7\n");
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 sv_cmd stuffto client <command>\n");
+ print("\nUsage:^3 sv_cmd stuffto client \"command\"\n");
print(" 'client' is the entity number or name of the player,\n");
print(" and 'command' is the command to be sent to that player.\n");
return;
}
void GameCommand_trace(float request, float argc)
-{
+{
switch(request)
{
case CMD_REQUEST_COMMAND:
{
- // TODO: Clean up all of these variables and merge the code below to use only a few
+ // This is kinda a mess, a lot of it is legacy and thus not rewritten/optimized.
entity e;
vector org, delta, start, end, p, q, q0, pos, vv, dv;
float i, f, safe, unsafe, dq, dqf;
print("Incorrect parameters for ^2trace^7\n");
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 sv_cmd trace command [arguments]\n");
- print(" TODO: Arguments currently unknown\n");
+ print("\nUsage:^3 sv_cmd trace command (startpos endpos)\n");
+ print(" Full list of commands here: \"debug, debug2, walk, showline.\"\n");
return;
}
}
}
}
-void GameCommand_warp(float request, float argc)
+void GameCommand_warp(float request, float argc) // mostly legacy
{
switch (request)
{
}
}
-/* use this when creating a new command, making sure to place it in alphabetical order.
+/* use this when creating a new command, making sure to place it in alphabetical order... also,
+** ADD ALL NEW COMMANDS TO commands.cfg WITH PROPER ALIASES IN THE SAME FASHION!
void GameCommand_(float request)
{
switch(request)
// ==================================
// Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
+// Common commands have double indentation to separate them a bit.
#define SERVER_COMMANDS(request,arguments,command) \
SERVER_COMMAND("adminmsg", GameCommand_adminmsg(request, arguments), "Send an admin message to a client directly") \
SERVER_COMMAND("allready", GameCommand_allready(request), "Restart the server and reset the players") \
SERVER_COMMAND("bbox", GameCommand_bbox(request), "Print detailed information about world size") \
SERVER_COMMAND("bot_cmd", GameCommand_bot_cmd(request, arguments), "Control and send commands to bots") \
SERVER_COMMAND("cointoss", GameCommand_cointoss(request, arguments), "Flip a virtual coin and give random result") \
- SERVER_COMMAND("cvar_changes", CommonCommand_cvar_changes(request, world), "Prints a list of all changed server cvars") \
- SERVER_COMMAND("cvar_purechanges", CommonCommand_cvar_purechanges(request, world), "Prints a list of all changed gameplay cvars") \
SERVER_COMMAND("database", GameCommand_database(request, arguments), "Extra controls of the serverprogs database") \
SERVER_COMMAND("defer_clear", GameCommand_defer_clear(request, arguments), "Clear all queued defer commands for a specific client") \
SERVER_COMMAND("defer_clear_all", GameCommand_defer_clear_all(request), "Clear all queued defer commands for all clients") \
SERVER_COMMAND("gametype", GameCommand_gametype(request, arguments), "Simple command to change the active gametype") \
SERVER_COMMAND("gettaginfo", GameCommand_gettaginfo(request, arguments), "Get specific information about a weapon model") \
SERVER_COMMAND("gotomap", GameCommand_gotomap(request, arguments), "Simple command to switch to another map") \
- SERVER_COMMAND("info", CommonCommand_info(request, world, arguments), "todo") \
- SERVER_COMMAND("ladder", CommonCommand_ladder(request, world), "Get information about top players if supported") \
SERVER_COMMAND("lockteams", GameCommand_lockteams(request), "Disable the ability for players to switch or enter teams") \
- SERVER_COMMAND("lsmaps", CommonCommand_lsmaps(request, world), "List maps which can be used with the current game mode") \
- SERVER_COMMAND("lsnewmaps", CommonCommand_lsnewmaps(request, world), "todo") \
SERVER_COMMAND("make_mapinfo", GameCommand_make_mapinfo(request), "Automatically rebuild mapinfo files") \
- SERVER_COMMAND("maplist", CommonCommand_maplist(request, world), "Display full server maplist reply") \
- SERVER_COMMAND("modelbug", GameCommand_modelbug(request), "TODO foobar") \
SERVER_COMMAND("moveplayer", GameCommand_moveplayer(request, arguments), "Change the team/status of a player") \
SERVER_COMMAND("nospectators", GameCommand_nospectators(request), "Automatically remove spectators from a match") \
- SERVER_COMMAND("onslaught_updatelinks", GameCommand_onslaught_updatelinks(request), "Refresh link status for onslaught") \
SERVER_COMMAND("playerdemo", GameCommand_playerdemo(request, arguments), "Control the ability to save demos of players") \
- SERVER_COMMAND("printstats", GameCommand_printstats(request), "TODO foobar") \
+ SERVER_COMMAND("printstats", GameCommand_printstats(request), "Dump eventlog player stats and other score information") \
SERVER_COMMAND("radarmap", GameCommand_radarmap(request, arguments), "Generate a radar image of the map") \
- SERVER_COMMAND("rankings", CommonCommand_rankings(request, world), "Print information about rankings") \
- SERVER_COMMAND("records", CommonCommand_records(request, world), "List top 10 records for the current map") \
SERVER_COMMAND("reducematchtime", GameCommand_reducematchtime(request), "Decrease the timelimit value incrementally") \
SERVER_COMMAND("setbots", GameCommand_setbots(request, arguments), "Adjust how many bots are in the match") \
SERVER_COMMAND("shuffleteams", GameCommand_shuffleteams(request), "Randomly move players to different teams") \
SERVER_COMMAND("stuffto", GameCommand_stuffto(request, arguments), "Send a command to be executed on a client") \
- SERVER_COMMAND("teamstatus", CommonCommand_teamstatus(request, world), "Show information about player and team scores") \
- SERVER_COMMAND("time", CommonCommand_time(request, world), "Print different formats/readouts of time") \
- SERVER_COMMAND("timein", CommonCommand_timein(request, world), "Resume the game from being paused with a timeout") \
- SERVER_COMMAND("timeout", CommonCommand_timeout(request, world), "Call a timeout which pauses the game for certain amount of time unless unpaused") \
SERVER_COMMAND("trace", GameCommand_trace(request, arguments), "Various debugging tools with tracing") \
SERVER_COMMAND("unlockteams", GameCommand_unlockteams(request), "Enable the ability for players to switch or enter teams") \
SERVER_COMMAND("warp", GameCommand_warp(request, arguments), "Choose different level in campaign") \
- SERVER_COMMAND("who", CommonCommand_who(request, world, arguments), "Display detailed client information about all players") \
- SERVER_COMMAND("vote", VoteCommand(request, world, arguments, command), "Server side control of voting") \
/* nothing */
void GameCommand_macro_help()
{
if(argc == 1)
{
- print("\nUsage:^3 sv_cmd COMMAND...^7, where possible commands are:\n");
+ print("\nServer console commands:\n");
GameCommand_macro_help();
+ print("\nBanning commands:\n");
GameCommand_Ban("help");
- GameCommand_Generic("help");
- print("For help about specific commands, type sv_cmd help COMMAND\n");
+
+ print("\nCommon networked commands:\n");
+ CommonCommand_macro_help();
+
+ print("\nGeneric commands shared by all programs:\n");
+ GenericCommand_macro_help();
+
+ print("\nUsage:^3 sv_cmd COMMAND...^7, where possible commands are listed above.\n");
+ print("For help about a specific command, type sv_cmd help COMMAND\n");
+
return;
}
- else if(GameCommand_macro_usage(argc)) // Instead of trying to call a command, we're going to see detailed information about it
+ else if(CommonCommand_macro_usage(argc)) // Instead of trying to call a command, we're going to see detailed information about it
+ {
+ return;
+ }
+ else if(GenericCommand_macro_usage(argc)) // same here, but for generic commands instead
+ {
+ return;
+ }
+ else if(GameCommand_macro_usage(argc)) // finally try for normal commands too
{
return;
}
}
else if(GameCommand_Ban(command))
{
- return; // handled by server/ipban.qc
+ return; // handled by server/command/ipban.qc
+ }
+ else if(CommonCommand_macro_command(argc, command))
+ {
+ return; // handled by server/command/common.qc
}
- else if(GameCommand_Generic(command))
+ else if(GenericCommand(command))
{
- return; // handled by common/gamecommand.qc
+ return; // handled by common/command/generic.qc
}
else if(GameCommand_macro_command(argc, command)) // continue as usual and scan for normal commands
{
projects / xonotic / xonotic-data.pk3dir.git / blobdiff