// =====================================================
// Server side game commands code, reworked by Samual
-// Last updated: November 8th, 2011
+// Last updated: December 6th, 2011
// =====================================================
#define GC_REQUEST_COMMAND 1
// Command Sub-Functions
// =======================
-void GameCommand_adminmsg(float request, float argc)
+void GameCommand_adminmsg(float request, float argc) // todo: re-write this, plus support multiple clients at once like moveplayer
{
switch(request)
{
string reason = argv(1);
float i;
- FOR_EACH_PLAYER(client)
+ FOR_EACH_REALPLAYER(client)
{
self = client;
PutObserverInServer();
GameCommand_defer_clear(GC_REQUEST_COMMAND, argc);
++i;
}
- if(i) { bprint(strcat("Successfully stuffed defer clear to all clients (", ftos(i), ")\n")); } // should a message be added if no players were found?
+ if(i) { print(strcat("Successfully stuffed defer clear to all clients (", ftos(i), ")\n")); } // should a message be added if no players were found?
return;
}
bprint("^1The teams are now locked.\n");
}
else
- bprint("That command can only be used in a team-based gamemode.\n");
+ {
+ bprint("lockteams command can only be used in a team-based gamemode.\n");
+ }
return;
}
}
if(successful)
- print("Successfully moved players ", successful, " to destination ", destination, ".\n");
+ bprint("Successfully moved players ", successful, " to destination ", destination, ".\n");
else
print("No players given (", original_targets, ") are able to move.\n");
case "read":
{
// TODO: Create a general command for looking this up, save a lot of space everywhere in this file
- entno = stof(argv(2));
+ entno = GetFilteredNumber(argv(2));
if((entno < 1) | (entno > maxclients)) {
print("Player ", argv(2), " doesn't exist\n");
return;
case "write":
{
- entno = stof(argv(2));
+ entno = GetFilteredNumber(argv(2));
if((entno < 1) | (entno > maxclients)) {
print("Player ", argv(2), " doesn't exist\n");
return;
case "auto_read_and_write":
{
s = argv(2);
- n = stof(argv(3));
+ n = GetFilteredNumber(argv(3));
cvar_set("bot_number", ftos(n));
localcmd("wait; wait; wait\n");
for(i = 0; i < n; ++i)
case "auto_read":
{
s = argv(2);
- n = stof(argv(3));
+ n = GetFilteredNumber(argv(3));
cvar_set("bot_number", ftos(n));
localcmd("wait; wait; wait\n");
for(i = 0; i < n; ++i)
{
case GC_REQUEST_COMMAND:
{
- if(argc >= 3 && argv(1) == "setbots")
+ if(argc >= 2)
{
cvar_settemp("minplayers", "0");
- cvar_settemp("bot_number", argv(2));
+ cvar_settemp("bot_number", argv(1));
bot_fixcount();
return;
}
}
default:
+ print("Incorrect parameters for ^2setbots^7\n");
case GC_REQUEST_USAGE:
{
print("\nUsage:^3 sv_cmd setbots botnumber\n");
if(teamplay)
{
entity tmp_player;
- float i, x, z, t_teams, t_players, random_number, team_color;
+ float i, x, z, t_teams, t_players, team_color;
// count the total amount of players and total amount of teams
FOR_EACH_PLAYER(tmp_player)
{
for(;;)
{
- random_number = bound(1, floor(random() * maxclients) + 1, maxclients);
+ i = bound(1, floor(random() * maxclients) + 1, maxclients);
- if(shuffleteams_players[random_number])
+ if(shuffleteams_players[i])
{
continue; // a player is already assigned to this slot
}
else
{
- shuffleteams_players[random_number] = num_for_edict(tmp_player);
+ shuffleteams_players[i] = num_for_edict(tmp_player);
break;
}
}
// sort through the random list of players made earlier
for(z = 1; z <= maxclients; ++z)
- {
- if(shuffleteams_teams[i] >= x)
- break; // move on to next team
-
- if not(shuffleteams_players[z])
- continue; // not a player, move on to next random slot
-
- self = edict_num(shuffleteams_players[z]); // TODO: add sanity checks for this entity to make sure it's okay and not some error.
- if(self.team != team_color)
+ {
+ if not(shuffleteams_teams[i] >= x)
{
- MoveToTeam(self, team_color, 6, 0);
+ if not(shuffleteams_players[z])
+ continue; // not a player, move on to next random slot
+
+ self = edict_num(shuffleteams_players[z]); // TODO: add sanity checks for this entity to make sure it's okay and not some error.
+
+ if(self.team != team_color)
+ MoveToTeam(self, team_color, 6, 0);
+
shuffleteams_players[z] = 0;
shuffleteams_teams[i] = shuffleteams_teams[i] + 1;
}
+ else
+ {
+ break; // move on to next team
+ }
}
}
- print("Successfully shuffled the players around randomly.\n");
+ bprint("Successfully shuffled the players around randomly.\n");
// clear the buffers now
for (i=0; i<SHUFFLETEAMS_MAX_PLAYERS; ++i)
if(argc == 3)
{
- entno = stof(argv(1));
+ entno = GetFilteredNumber(argv(1));
client = world;
if(entno <= maxclients)
client = edict_num(entno);
switch(argv(1))
{
case "debug":
+ {
print("TEST CASE. If this returns the runaway loop counter error, possibly everything is oaky.\n");
for(;;)
{
}
}
return;
+ }
case "debug2":
+ {
e = nextent(world);
tracebox(e.origin + '0 0 32', e.mins, e.maxs, e.origin + '0 0 -1024', MOVE_NORMAL, e);
vv = trace_endpos;
}
print("highest possible dist: ", ftos(f), "\n");
return;
+ }
case "walk":
+ {
if(argc == 3)
{
e = nextent(world);
print("cannot walk\n");
return;
}
-
+ }
+
case "showline":
+ {
if(argc == 3)
{
vv = stov(argv(1));
trailparticles(world, particleeffectnum("TR_CRYLINKPLASMA"), trace_endpos, dv);
return;
}
- // no default case, just go straight to "invalid arguments"
+ }
+
+ // no default case, just go straight to invalid
}
}
default:
+ print("Incorrect parameters for ^2trace^7\n");
case GC_REQUEST_USAGE:
{
print("\nUsage:^3 sv_cmd trace command [arguments]\n");
bprint("^1The teams are now unlocked.\n");
}
else
- bprint("That command can only be used in a team-based gamemode.\n");
+ {
+ bprint("unlockteams command can only be used in a team-based gamemode.\n");
+ }
return;
}
*/
-// ===========================
-// Macro system for commands
-// ===========================
+// ==================================
+// Macro system for server commands
+// ==================================
-// For now, the list has to be split up due to the suckage called fteqcc which limits macros to only 1024 characters
// Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
-#define SERVER_COMMANDS_1(request,arguments) \
+#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("allspec", GameCommand_allspec(request, arguments), "Force all players to spectate") \
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", GameCommand_cvar_changes(request), "Prints a list of all changed server cvars") \
- /* nothing */
-
-#define SERVER_COMMANDS_2(request,arguments) \
SERVER_COMMAND("cvar_purechanges", GameCommand_cvar_purechanges(request), "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("delrec", GameCommand_delrec(request, arguments), "Delete race time record for a map") \
SERVER_COMMAND("effectindexdump", GameCommand_effectindexdump(request), "Dump list of effects from code and effectinfo.txt") \
SERVER_COMMAND("extendmatchtime", GameCommand_extendmatchtime(request), "Increase the timelimit value incrementally") \
- /* nothing */
-
-#define SERVER_COMMANDS_3(request,arguments) \
SERVER_COMMAND("find", GameCommand_find(request, arguments), "Search through entities for matching classname") \
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("lockteams", GameCommand_lockteams(request), "Disable the ability for players to switch or enter teams") \
SERVER_COMMAND("make_mapinfo", GameCommand_make_mapinfo(request), "Automatically rebuild mapinfo files") \
SERVER_COMMAND("modelbug", GameCommand_modelbug(request), "TODO foobar") \
- /* nothing */
-
-#define SERVER_COMMANDS_4(request,arguments) \
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("radarmap", GameCommand_radarmap(request, arguments), "Generate a radar image of the map") \
SERVER_COMMAND("rankings", GameCommand_rankings(request), "Print information about rankings") \
SERVER_COMMAND("records", GameCommand_records(request), "List top 10 records for the current map") \
- /* nothing */
-
-#define SERVER_COMMANDS_5(request,arguments) \
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("time", GameCommand_time(request), "Print different formats/readouts of time") \
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") \
- /* nothing */
-
-#define SERVER_COMMANDS_6(request,arguments) \
SERVER_COMMAND("warp", GameCommand_warp(request, arguments), "Choose different level in campaign") \
+ SERVER_COMMAND("vote", VoteCommand(request, world, arguments, command), "Server side control of voting") /* handled in server/vote.qc */ \
/* nothing */
void GameCommand_macro_help()
#define SERVER_COMMAND(name,function,description) \
{ print(" ^2", name, "^7: ", description, "\n"); }
- SERVER_COMMANDS_1(0, 0)
- SERVER_COMMANDS_2(0, 0)
- SERVER_COMMANDS_3(0, 0)
- SERVER_COMMANDS_4(0, 0)
- SERVER_COMMANDS_5(0, 0)
- SERVER_COMMANDS_6(0, 0)
+ SERVER_COMMANDS(0, 0, "")
#undef SERVER_COMMAND
return;
}
-float GameCommand_macro_command(float argc)
+float GameCommand_macro_command(float argc, string command)
{
#define SERVER_COMMAND(name,function,description) \
{ if(name == strtolower(argv(0))) { function; return TRUE; } }
- SERVER_COMMANDS_1(GC_REQUEST_COMMAND, argc)
- SERVER_COMMANDS_2(GC_REQUEST_COMMAND, argc)
- SERVER_COMMANDS_3(GC_REQUEST_COMMAND, argc)
- SERVER_COMMANDS_4(GC_REQUEST_COMMAND, argc)
- SERVER_COMMANDS_5(GC_REQUEST_COMMAND, argc)
- SERVER_COMMANDS_6(GC_REQUEST_COMMAND, argc)
+ SERVER_COMMANDS(GC_REQUEST_COMMAND, argc, command)
#undef SERVER_COMMAND
return FALSE;
#define SERVER_COMMAND(name,function,description) \
{ if(name == strtolower(argv(1))) { function; return TRUE; } }
- SERVER_COMMANDS_1(GC_REQUEST_USAGE, argc)
- SERVER_COMMANDS_2(GC_REQUEST_USAGE, argc)
- SERVER_COMMANDS_3(GC_REQUEST_USAGE, argc)
- SERVER_COMMANDS_4(GC_REQUEST_USAGE, argc)
- SERVER_COMMANDS_5(GC_REQUEST_USAGE, argc)
- SERVER_COMMANDS_6(GC_REQUEST_USAGE, argc)
+ SERVER_COMMANDS(GC_REQUEST_USAGE, argc, "")
#undef SERVER_COMMAND
return FALSE;
{
print("\nUsage:^3 sv_cmd COMMAND...^7, where possible commands are:\n");
GameCommand_macro_help();
- GameCommand_Vote("help", world);
+
GameCommand_Ban("help");
GameCommand_Generic("help");
print("For help about specific commands, type sv_cmd help COMMAND\n");
return;
}
}
- else if(GameCommand_Vote(command, world))
- {
- return; // handled by server/vote.qc
- }
else if(GameCommand_Ban(command))
{
return; // handled by server/ipban.qc
{
return; // handled by common/gamecommand.qc
}
- else if(GameCommand_macro_command(argc)) // continue as usual and scan for normal commands
+ else if(GameCommand_macro_command(argc, command)) // continue as usual and scan for normal commands
{
return; // handled by one of the above GameCommand_* functions
}
// nothing above caught the command, must be invalid
- print("Invalid command. For a list of supported commands, try sv_cmd help.\n");
+ print("Unknown server command", ((command != "") ? strcat(" \"", command, "\"") : ""), ". For a list of supported commands, try sv_cmd help.\n");
return;
}
\ No newline at end of file
projects / xonotic / xonotic-data.pk3dir.git / blobdiff