]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Move all of the command files (clientcommands.qc, gamecommand.qc, command_common...
authorSamual <samual@xonotic.org>
Tue, 13 Dec 2011 08:21:33 +0000 (03:21 -0500)
committerSamual <samual@xonotic.org>
Tue, 13 Dec 2011 08:21:33 +0000 (03:21 -0500)
qcsrc/server/clientcommands.qc [deleted file]
qcsrc/server/command/cmd.qc [new file with mode: 0644]
qcsrc/server/command/common.qc [new file with mode: 0644]
qcsrc/server/command/sv_cmd.qc [new file with mode: 0644]
qcsrc/server/command/vote.qc [new file with mode: 0644]
qcsrc/server/command/vote.qh [new file with mode: 0644]
qcsrc/server/command_common.qc [deleted file]
qcsrc/server/gamecommand.qc [deleted file]
qcsrc/server/vote.qc [deleted file]
qcsrc/server/vote.qh [deleted file]

diff --git a/qcsrc/server/clientcommands.qc b/qcsrc/server/clientcommands.qc
deleted file mode 100644 (file)
index 86ff171..0000000
+++ /dev/null
@@ -1,1079 +0,0 @@
-// =========================================================
-//  Server side networked commands code, reworked by Samual
-//  Last updated: December 11th, 2011
-// =========================================================
-
-#define CC_REQUEST_COMMAND 1
-#define CC_REQUEST_USAGE 2
-
-.float cmd_floodtime;
-.float cmd_floodcount;
-.float checkfail;
-.float lms_spectate_warning;
-
-string MapVote_Suggest(string m);
-//void MapVote_SendPicture(float id)
-
-// move any necessary sprint statements to "print_to"
-
-// ============================
-//  Misc. Supporting Functions
-// ============================
-
-float SV_ParseClientCommand_floodcheck()
-{
-       if (timeoutStatus != 2) // if the game is not paused... but wait, doesn't that mean it could be dos'd by pausing it? eh? (old code)
-       {
-               if(time <= (self.cmd_floodtime + autocvar_sv_clientcommand_antispam_time))
-               {
-                       self.cmd_floodcount += 1;
-                       if(self.cmd_floodcount > autocvar_sv_clientcommand_antispam_count) { return FALSE; } // too much spam, halt
-               }
-               else
-               {
-                       self.cmd_floodtime = time;
-                       self.cmd_floodcount = 1;
-               }
-       }
-       return TRUE; // continue, as we're not flooding yet
-}
-
-
-// =======================
-//  Command Sub-Functions
-// =======================
-
-void ClientCommand_autoswitch(float request, float argc)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       self.autoswitch = ("0" != argv(1));
-                       sprint(self, strcat("^1autoswitch is currently turned ", (self.autoswitch ? "on" : "off"), ".\n"));
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd autoswitch selection\n");
-                       sprint(self, "  Where 'selection' is 1 or 0 for on or off.\n"); 
-                       return;
-               }
-       }
-}
-
-void ClientCommand_checkfail(float request, string command) // used only by client side code
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       print(sprintf("CHECKFAIL: %s (%s) epically failed check %s\n", self.netname, self.netaddress, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1))));
-                       self.checkfail = 1;
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd checkfail message\n");
-                       sprint(self, "  Where 'message' is the message reported by client about the fail.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_clientversion(float request, float argc) // used only by client side code
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(self.flags & FL_CLIENT)
-                       {
-                               self.version = ((argv(1) == "$gameversion") ? 1 : stof(argv(1)));
-                               
-                               if(self.version < autocvar_gameversion_min || self.version > autocvar_gameversion_max)
-                               {
-                                       self.version_mismatch = 1;
-                                       ClientKill_TeamChange(-2); // observe
-                               } 
-                               else if(autocvar_g_campaign || autocvar_g_balance_teams || autocvar_g_balance_teams_force) 
-                               {
-                                       //JoinBestTeam(self, FALSE, TRUE);
-                               } 
-                               else if(teamplay && !autocvar_sv_spectate && !(self.team_forced > 0)) 
-                               {
-                                       self.classname = "observer"; // really?
-                                       stuffcmd(self, "menu_showteamselect\n");
-                               }
-                       }
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd clientversion version\n");
-                       sprint(self, "  Where 'version' is the game version reported by self.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_cvar_changes(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       sprint(self, cvar_changes);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 sv_cmd cvar_changes\n");
-                       sprint(self, "  No arguments required.\n");
-                       //sprint(self, "See also: ^2cvar_purechanges^7\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_cvar_purechanges(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       sprint(self, cvar_purechanges);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 sv_cmd cvar_purechanges\n");
-                       sprint(self, "  No arguments required.\n");
-                       //sprint(self, "See also: ^2cvar_changes^7\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_getmapvotepic(float request, float argc)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(intermission_running)                                
-                               MapVote_SendPicture(stof(argv(1)));
-
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd getmapvotepic mapid\n");
-                       sprint(self, "  Where 'mapid' is the id number of the map to request an image of on the map vote selection menu.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_info(float request, float argc)
-{      
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       string command;
-                       
-                       command = builtin_cvar_string(strcat("sv_info_", argv(1))); 
-                       if(command)
-                               wordwrap_sprint(command, 1111); // why 1111?
-                       else
-                               sprint(self, "ERROR: unsupported info command\n");
-                               
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd info request\n");
-                       sprint(self, "  Where 'request' is the suffixed string appended onto the request for cvar.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_join(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(self.flags & FL_CLIENT)
-                       {
-                               if(self.classname != "player" && !lockteams && !g_arena)
-                               {
-                                       if(nJoinAllowed(1)) 
-                                       {
-                                               if(g_ca) { self.caplayer = 1; }
-                                               if(autocvar_g_campaign) { campaign_bots_may_start = 1; }
-                                               
-                                               self.classname = "player";
-                                               PlayerScore_Clear(self);
-                                               bprint ("^4", self.netname, "^4 is playing now\n");
-                                               PutClientInServer();
-                                       }
-                                       else 
-                                       {
-                                               //player may not join because of g_maxplayers is set
-                                               centerprint(self, PREVENT_JOIN_TEXT);
-                                       }
-                               }
-                       }
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd join\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_ladder(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       sprint(self, ladder_reply);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd ladder\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_lsmaps(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       sprint(self, lsmaps_reply);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd lsmaps\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_lsnewmaps(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       sprint(self, lsnewmaps_reply);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd lsnewmaps\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_maplist(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       sprint(self, maplist_reply);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd maplist\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_rankings(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       sprint(self, rankings_reply);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd rankings\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_ready(float request) 
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(self.flags & FL_CLIENT)
-                       {
-                               if(inWarmupStage || autocvar_sv_ready_restart || g_race_qualifying == 2)
-                               {
-                                       if(!readyrestart_happened || autocvar_sv_ready_restart_repeatable)
-                                       {
-                                               if (self.ready) // toggle
-                                               {
-                                                       self.ready = FALSE;
-                                                       bprint(self.netname, "^2 is ^1NOT^2 ready\n");
-                                               }
-                                               else
-                                               {
-                                                       self.ready = TRUE;
-                                                       bprint(self.netname, "^2 is ready\n");
-                                               }
-
-                                               // cannot reset the game while a timeout is active!
-                                               if(!timeoutStatus)
-                                                       ReadyCount();
-                                       } else {
-                                               sprint(self, "^1Game has already been restarted\n");
-                                       }
-                               }
-                       }
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd ready\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_records(float request) // TODO: Isn't this flooding with the sprint messages? Old code, but perhaps bad?
-{      
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       float i;
-                       
-                       for(i = 0; i < 10; ++i)
-                               sprint(self, records_reply[i]);
-                               
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd records\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_reportcvar(float request, float argc, string command) // TODO: confirm this works
-{      
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       float tokens;
-                       string s;
-                       
-                       if(substring(argv(2), 0, 1) == "$") // undefined cvar: use the default value on the server then
-                       {
-                               s = strcat(substring(command, argv_start_index(0), argv_end_index(1) - argv_start_index(0)), " \"", cvar_defstring(argv(1)), "\"");
-                               tokens = tokenize_console(s);
-                       }
-                       GetCvars(1);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd reportcvar <cvar>\n");
-                       sprint(self, "  Where 'cvar' is the cvar plus arguments to send to the server.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_say(float request, float argc, string command)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(argc >= 2) { Say(self, FALSE, world, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); }
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd say <message>\n");
-                       sprint(self, "  Where 'message' is the string of text to say.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_say_team(float request, float argc, string command)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(argc >= 2) { Say(self, TRUE, world, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); }
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd say_team <message>\n");
-                       sprint(self, "  Where 'message' is the string of text to say.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_selectteam(float request, float argc) // TODO: Update the messages for this command
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       float selection;
-                       
-                       if (self.flags & FL_CLIENT)
-                       {
-                               if(teamplay)
-                                       if not(self.team_forced > 0) 
-                                               if not(lockteams) 
-                                               {
-                                                       switch(argv(1))
-                                                       {
-                                                               case "red": selection = COLOR_TEAM1; break;
-                                                               case "blue": selection = COLOR_TEAM2; break;
-                                                               case "yellow": selection = COLOR_TEAM3; break;
-                                                               case "pink": selection = COLOR_TEAM4; break;
-                                                               case "auto": selection = (-1); break;
-                                                               
-                                                               default: break;
-                                                       }
-                                                       
-                                                       if(selection)
-                                                       {
-                                                               if(self.team == selection && self.deadflag == DEAD_NO)
-                                                                       sprint(self, "^7You already are on that team.\n");
-                                                               else if(self.wasplayer && autocvar_g_changeteam_banned)
-                                                                       sprint(self, "^1You cannot change team, forbidden by the server.\n");
-                                                               else
-                                                                       ClientKill_TeamChange(selection);
-                                                       }
-                                               }
-                                               else
-                                                       sprint(self, "^7The game has already begun, you must wait until the next map to be able to join a team.\n");
-                                       else
-                                               sprint(self, "^7selectteam can not be used as your team is forced\n");
-                               else
-                                       sprint(self, "^7selectteam can only be used in teamgames\n");
-                       }
-                       return; // never fall through to usage
-               }
-
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       //sprint(self, strcat( "selectteam none/red/blue/yellow/pink/auto - \"", argv(1), "\" not recognised\n" ) );
-                       sprint(self, "\nUsage:^3 cmd selectteam team\n");
-                       sprint(self, "  Where 'team' is the prefered team to try and join.\n");
-                       sprint(self, "  Full list of options here: \"red, blue, yellow, pink, auto\"\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_selfstuff(float request, string command)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       stuffcmd(self, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)));
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd selfstuff command\n");
-                       sprint(self, "  Where 'command' is the string to be stuffed to your client.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_sentcvar(float request, float argc, string command)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       float tokens;
-                       string s;
-                       
-                       if(argc == 2) // undefined cvar: use the default value on the server then
-                       {
-                               s = strcat(substring(command, argv_start_index(0), argv_end_index(1) - argv_start_index(0)), " \"", cvar_defstring(argv(1)), "\"");
-                               tokens = tokenize_console(s);
-                       }
-                       GetCvars(1);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd sentcvar <cvar>\n");
-                       sprint(self, "  Where 'cvar' is the cvar plus arguments to send to the server.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_spectate(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(self.flags & FL_CLIENT)
-                       {
-                               if(g_arena) { return; } 
-                               if(g_lms)
-                               {
-                                       if(self.lms_spectate_warning)
-                                       {
-                                               // mark player as spectator
-                                               PlayerScore_Add(self, SP_LMS_RANK, 666 - PlayerScore_Add(self, SP_LMS_RANK, 0));
-                                       }
-                                       else
-                                       {
-                                               self.lms_spectate_warning = 1;
-                                               sprint(self, "WARNING: you won't be able to enter the game again after spectating in LMS. Use the same command again to spectate anyway.\n");
-                                               return;
-                                       }
-                               }
-                               
-                               if(self.classname == "player" && autocvar_sv_spectate == 1) 
-                                       ClientKill_TeamChange(-2); // observe
-                               
-                               // in CA, allow a dead player to move to spectatators (without that, caplayer!=0 will be moved back to the player list)
-                               // note: if arena game mode is ever done properly, this needs to be removed.
-                               if(g_ca && self.caplayer && (self.classname == "spectator" || self.classname == "observer"))
-                               {
-                                       sprint(self, "WARNING: you will spectate in the next round.\n");
-                                       self.caplayer = 0;
-                               }
-                       }
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd spectate\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_suggestmap(float request, float argc)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       sprint(self, strcat(MapVote_Suggest(argv(1)), "\n"));
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd suggestmap map\n");
-                       sprint(self, "  Where 'map' is the name of the map to suggest.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_teamstatus(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       Score_NicePrint(self);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd teamstatus\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_tell(float request, float argc, string command)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       entity e = GetCommandPlayerSlotTargetFromTokenizedCommand(argc, 1);
-                       
-                       if(e && argc > ParseCommandPlayerSlotTarget_firsttoken)
-                       {
-                               Say(self, FALSE, e, substring(command, argv_start_index(ParseCommandPlayerSlotTarget_firsttoken), argv_end_index(-1) - argv_start_index(ParseCommandPlayerSlotTarget_firsttoken)), TRUE);
-                       }
-                       else
-                       {
-                               if(argc > ParseCommandPlayerSlotTarget_firsttoken)
-                                       trigger_magicear_processmessage_forallears(self, -1, world, substring(command, argv_start_index(ParseCommandPlayerSlotTarget_firsttoken), argv_end_index(-1) - argv_start_index(ParseCommandPlayerSlotTarget_firsttoken)));
-                       }
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd tell playerid <message>\n");
-                       sprint(self, "  Where 'playerid' is the entity number of the player to send the 'message' to.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_timein(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(self.flags & FL_CLIENT)
-                       {
-                               if(autocvar_sv_timeout)
-                               {
-                                       if (!timeoutStatus)
-                                               return sprint(self, "^7Error: There is no active timeout which could be aborted!\n");
-                                       if (self != timeoutInitiator)
-                                               return sprint(self, "^7Error: You may not abort the active timeout. Only the player who called it can do that!\n");
-                                               
-                                       if (timeoutStatus == 1) 
-                                       {
-                                               remainingTimeoutTime = timeoutStatus = 0;
-                                               timeoutHandler.nextthink = time; //timeoutHandler has to take care of it immediately
-                                               bprint(strcat("^7The timeout was aborted by ", self.netname, " !\n"));
-                                       }
-                                       else if (timeoutStatus == 2) 
-                                       {
-                                               //only shorten the remainingTimeoutTime if it makes sense
-                                               if( remainingTimeoutTime > (autocvar_sv_timeout_resumetime + 1) ) 
-                                               {
-                                                       bprint(strcat("^1Attention: ^7", self.netname, " resumed the game! Prepare for battle!\n"));
-                                                       remainingTimeoutTime = autocvar_sv_timeout_resumetime;
-                                                       timeoutHandler.nextthink = time; //timeoutHandler has to take care of it immediately
-                                               }
-                                               else
-                                                       sprint(self, "^7Error: Your resumegame call was discarded!\n");
-                                       }
-                               }
-                       }
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd timein\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_timeout(float request) // DEAR GOD THIS COMMAND IS TERRIBLE.
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(self.flags & FL_CLIENT)
-                       {
-                               if(autocvar_sv_timeout) 
-                               {
-                                       if(self.classname == "player") 
-                                       {
-                                               if(votecalled)
-                                                       sprint(self, "^7Error: you can not call a timeout while a vote is active!\n");
-                                               else
-                                               {
-                                                       if (inWarmupStage && !g_warmup_allow_timeout)
-                                                               return sprint(self, "^7Error: You can not call a timeout in warmup-stage!\n");
-                                                       if (time < game_starttime )
-                                                               return sprint(self, "^7Error: You can not call a timeout while the map is being restarted!\n");
-                                                               
-                                                       if (timeoutStatus != 2) {
-                                                               //if the map uses a timelimit make sure that timeout cannot be called right before the map ends
-                                                               if (autocvar_timelimit) {
-                                                                       //a timelimit was used
-                                                                       float myTl;
-                                                                       myTl = autocvar_timelimit;
-
-                                                                       float lastPossibleTimeout;
-                                                                       lastPossibleTimeout = (myTl*60) - autocvar_sv_timeout_leadtime - 1;
-
-                                                                       if (lastPossibleTimeout < time - game_starttime)
-                                                                               return sprint(self, "^7Error: It is too late to call a timeout now!\n");
-                                                               }
-                                                       }
-                                                       
-                                                       //player may not call a timeout if he has no calls left
-                                                       if (self.allowedTimeouts < 1)
-                                                               return sprint(self, "^7Error: You already used all your timeout calls for this map!\n");
-                                                               
-                                                               
-                                                       //now all required checks are passed
-                                                       self.allowedTimeouts -= 1;
-                                                       bprint(self.netname, " ^7called a timeout (", ftos(self.allowedTimeouts), " timeouts left)!\n"); //write a bprint who started the timeout (and how many he has left)
-                                                       remainingTimeoutTime = autocvar_sv_timeout_length;
-                                                       remainingLeadTime = autocvar_sv_timeout_leadtime;
-                                                       timeoutInitiator = self;
-                                                       if (timeoutStatus == 0) { //if another timeout was already active, don't change its status (which was 1 or 2) to 1, only change it to 1 if no timeout was active yet
-                                                               timeoutStatus = 1;
-                                                               //create the timeout indicator which centerprints the information to all players and takes care of pausing/unpausing
-                                                               timeoutHandler = spawn();
-                                                               timeoutHandler.think = timeoutHandler_Think;
-                                                       }
-                                                       timeoutHandler.nextthink = time; //always let the entity think asap
-
-                                                       //inform all connected clients about the timeout call
-                                                       Announce("timeoutcalled");
-                                               }
-                                       }
-                                       else
-                                               sprint(self, "^7Error: only players can call a timeout!\n");
-                               }
-                       }
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd timeout\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_voice(float request, float argc, string command)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(argc >= 3)
-                               VoiceMessage(argv(1), substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2)));
-                       else
-                               VoiceMessage(argv(1), "");
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd voice\n");
-                       sprint(self, "  FIXME ARGUMENTS UNKNOWN.\n");
-                       return;
-               }
-       }
-}
-
-string strlimitedlen(string input, float strip_colors, float limit)
-{
-       if(strlen((strip_colors ? strdecolorize(input) : input)) <= limit)
-               return input;
-       else
-               return strcat(substring(input, 0, (strlen(input) - 3)), "...");
-}
-
-void ClientCommand_who(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       float total_listed_players, tmp_hours, tmp_minutes, tmp_seconds;
-                       entity tmp_player;
-                       string tmp_player_name;
-                       
-                       sprint(self, strcat("List of client information", (autocvar_sv_status_privacy ? " (some data is hidden for privacy)" : string_null), ":\n"));
-                       sprint(self, sprintf(" %-4s %-20s %-5s %-3s %-9s %-16s %s\n", "ent", "nickname", "ping", "pl", "time", "ip", "crypto_id"));
-                       
-                       FOR_EACH_CLIENT(tmp_player)
-                       {
-                               tmp_player_name = strlimitedlen(tmp_player.netname, TRUE, 20);
-                               
-                               tmp_hours = tmp_minutes = tmp_seconds = 0;
-                               
-                               tmp_seconds = (time - tmp_player.jointime);
-                               tmp_minutes = (tmp_seconds / 60);
-                               
-                               if(tmp_minutes)
-                               {
-                                       tmp_seconds -= (tmp_minutes * 60);
-                                       tmp_hours = (tmp_minutes / 60);
-                                       
-                                       if(tmp_hours) { tmp_minutes -= (tmp_hours * 60); }
-                               }
-                               
-                               sprint(self, sprintf(" %-4s %-20s %-5d %-3d %-9s %-16s %s\n", 
-                                       strcat("#", ftos(num_for_edict(tmp_player))), 
-                                       tmp_player.netname, //strcat(tmp_player_name, sprintf("%*s", (20 - strlen(strdecolorize(tmp_player_name))), "")),
-                                       tmp_player.ping, tmp_player.ping_packetloss, 
-                                       sprintf("%02d:%02d:%02d", tmp_hours, tmp_minutes, tmp_seconds),
-                                       (autocvar_sv_status_privacy ? "hidden" : tmp_player.netaddress),
-                                       (autocvar_sv_status_privacy ? "hidden" : tmp_player.crypto_idfp)));
-                                       
-                               ++total_listed_players;
-                       }
-                       
-                       sprint(self, strcat("Finished listing ", ftos(total_listed_players), " client(s). \n"));
-                       
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd who\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-/* use this when creating a new command, making sure to place it in alphabetical order.
-void ClientCommand_(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd \n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-*/
-
-
-// =====================================
-//  Macro system for networked commands
-// =====================================
-
-// Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
-#define CLIENT_COMMANDS(request,arguments,command) \
-       CLIENT_COMMAND("autoswitch", ClientCommand_autoswitch(request, arguments), "Whether or not to switch automatically when getting a better weapon") \
-       CLIENT_COMMAND("checkfail", ClientCommand_checkfail(request, command), "Report if a client-side check failed") \
-       CLIENT_COMMAND("clientversion", ClientCommand_clientversion(request, arguments), "Release version of the game") \
-       CLIENT_COMMAND("cvar_changes", ClientCommand_cvar_changes(request), "Prints a list of all changed server cvars") \
-       CLIENT_COMMAND("cvar_purechanges", ClientCommand_cvar_purechanges(request), "Prints a list of all changed gameplay cvars") \
-       CLIENT_COMMAND("getmapvotepic", ClientCommand_getmapvotepic(request, arguments), "Retrieve mapshot picture from the server") \
-       CLIENT_COMMAND("info", ClientCommand_info(request, arguments), "Request for unique server information set up by admin") \
-       CLIENT_COMMAND("join", ClientCommand_join(request), "Become a player in the game") \
-       CLIENT_COMMAND("ladder", ClientCommand_ladder(request), "Get information about top players if supported") \
-       CLIENT_COMMAND("lsmaps", ClientCommand_lsmaps(request), "List maps which can be used with the current game mode") \
-       CLIENT_COMMAND("lsnewmaps", ClientCommand_lsnewmaps(request), "List maps which TODO") \
-       CLIENT_COMMAND("maplist", ClientCommand_maplist(request), "Full server maplist reply") \
-       CLIENT_COMMAND("rankings", ClientCommand_rankings(request), "Print information about rankings") \
-       CLIENT_COMMAND("ready", ClientCommand_ready(request), "Qualify as ready to end warmup stage (or restart server if allowed)") \
-       CLIENT_COMMAND("records", ClientCommand_records(request), "List top 10 records for the current map") \
-       CLIENT_COMMAND("reportcvar", ClientCommand_reportcvar(request, arguments, command), "Old system for sending a client cvar to the server") \
-       CLIENT_COMMAND("say", ClientCommand_say(request, arguments, command), "Print a message to chat to all players") \
-       CLIENT_COMMAND("say_team", ClientCommand_say_team(request, arguments, command), "Print a message to chat to all team mates") \
-       CLIENT_COMMAND("selectteam", ClientCommand_selectteam(request, arguments), "Attempt to choose a team to join into") \
-       CLIENT_COMMAND("selfstuff", ClientCommand_selfstuff(request, command), "Stuffcmd a command to your own client") \
-       CLIENT_COMMAND("sentcvar", ClientCommand_sentcvar(request, arguments, command), "New system for sending a client cvar to the server") \
-       CLIENT_COMMAND("spectate", ClientCommand_spectate(request), "Become an observer") \
-       CLIENT_COMMAND("suggestmap", ClientCommand_suggestmap(request, arguments), "Suggest a map to the mapvote at match end") \
-       CLIENT_COMMAND("teamstatus", ClientCommand_teamstatus(request), "Print detailed score information for all players") \
-       CLIENT_COMMAND("tell", ClientCommand_tell(request, arguments, command), "Send a message directly to a player") \
-       CLIENT_COMMAND("timein", ClientCommand_timein(request), "Resume the game from being paused with a timeout") \
-       CLIENT_COMMAND("timeout", ClientCommand_timeout(request), "Call a timeout which pauses the game for certain amount of time unless unpaused") \
-       CLIENT_COMMAND("voice", ClientCommand_voice(request, arguments, command), "Send voice message via sound") \
-       CLIENT_COMMAND("vote", VoteCommand(request, self, arguments, command), "Request an action to be voted upon by players") \
-       CLIENT_COMMAND("who", ClientCommand_who(request), "Display detailed client information about all players") \
-       /* nothing */
-       
-void ClientCommand_macro_help()
-{
-       #define CLIENT_COMMAND(name,function,description) \
-               { print("  ^2", name, "^7: ", description, "\n"); }
-               
-       CLIENT_COMMANDS(0, 0, "")
-       #undef CLIENT_COMMAND
-       
-       return;
-}
-
-float ClientCommand_macro_command(float argc, string command)
-{
-       #define CLIENT_COMMAND(name,function,description) \
-               { if(name == strtolower(argv(0))) { function; return TRUE; } }
-               
-       CLIENT_COMMANDS(CC_REQUEST_COMMAND, argc, command)
-       #undef CLIENT_COMMAND
-       
-       return FALSE;
-}
-
-float ClientCommand_macro_usage(float argc, string command)
-{
-       #define CLIENT_COMMAND(name,function,description) \
-               { if(name == strtolower(argv(1))) { function; return TRUE; } }
-               
-       CLIENT_COMMANDS(CC_REQUEST_USAGE, argc, command)
-       #undef CLIENT_COMMAND
-       
-       return FALSE;
-}
-
-
-// ======================================
-//  Main Function Called By Engine (cmd)
-// ======================================
-// If this function exists, server game code parses clientcommand before the engine code gets it.
-
-void SV_ParseClientCommand(string command)
-{
-       float argc = tokenize_console(command);
-       
-       // for floodcheck
-       switch(strtolower(argv(0)))
-       {
-               // exempt commands which are not subject to floodcheck
-               case "begin": break; // handled by engine in host_cmd.c
-               case "getmapvotepic": break; // handled by server in this file
-               case "pause": break; // handled by engine in host_cmd.c
-               case "prespawn": break; // handled by engine in host_cmd.c
-               case "reportcvar": break; // handled by server in this file
-               case "sentcvar": break; // handled by server in this file
-               case "spawn": break; // handled by engine in host_cmd.c
-               
-               default: 
-                       if(SV_ParseClientCommand_floodcheck())
-                               break; // "TRUE": continue, as we're not flooding yet
-                       else
-                               return; // "FALSE": not allowed to continue, halt
-       }
-       
-       /* NOTE: totally disabled for now, however the functionality and descriptions are there if we ever want it.
-       if(argv(0) == "help") 
-       {
-               if(argc == 1) 
-               {
-                       sprint(self, "\nUsage:^3 cmd COMMAND...^7, where possible commands are:\n");
-                       ClientCommand_macro_help;
-                       sprint(self, "For help about specific commands, type cmd help COMMAND\n");
-                       return;
-               } 
-               else if(ClientCommand_macro_usage(argc, command)) // Instead of trying to call a command, we're going to see detailed information about it
-               {
-                       return;
-               }
-       } 
-       else*/ if(MUTATOR_CALLHOOK(SV_ParseClientCommand))
-       {
-               return; // handled by a mutator
-       }
-       else if(CheatCommand(argc)) 
-       {
-               return; // handled by server/cheats.qc
-       }
-       else if(ClientCommand_macro_command(argc, command)) // continue as usual and scan for normal commands
-       {
-               return; // handled by one of the above GameCommand_* functions
-       }
-       else
-               clientcommand(self, command);
-}
\ No newline at end of file
diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
new file mode 100644 (file)
index 0000000..86ff171
--- /dev/null
@@ -0,0 +1,1079 @@
+// =========================================================
+//  Server side networked commands code, reworked by Samual
+//  Last updated: December 11th, 2011
+// =========================================================
+
+#define CC_REQUEST_COMMAND 1
+#define CC_REQUEST_USAGE 2
+
+.float cmd_floodtime;
+.float cmd_floodcount;
+.float checkfail;
+.float lms_spectate_warning;
+
+string MapVote_Suggest(string m);
+//void MapVote_SendPicture(float id)
+
+// move any necessary sprint statements to "print_to"
+
+// ============================
+//  Misc. Supporting Functions
+// ============================
+
+float SV_ParseClientCommand_floodcheck()
+{
+       if (timeoutStatus != 2) // if the game is not paused... but wait, doesn't that mean it could be dos'd by pausing it? eh? (old code)
+       {
+               if(time <= (self.cmd_floodtime + autocvar_sv_clientcommand_antispam_time))
+               {
+                       self.cmd_floodcount += 1;
+                       if(self.cmd_floodcount > autocvar_sv_clientcommand_antispam_count) { return FALSE; } // too much spam, halt
+               }
+               else
+               {
+                       self.cmd_floodtime = time;
+                       self.cmd_floodcount = 1;
+               }
+       }
+       return TRUE; // continue, as we're not flooding yet
+}
+
+
+// =======================
+//  Command Sub-Functions
+// =======================
+
+void ClientCommand_autoswitch(float request, float argc)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       self.autoswitch = ("0" != argv(1));
+                       sprint(self, strcat("^1autoswitch is currently turned ", (self.autoswitch ? "on" : "off"), ".\n"));
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd autoswitch selection\n");
+                       sprint(self, "  Where 'selection' is 1 or 0 for on or off.\n"); 
+                       return;
+               }
+       }
+}
+
+void ClientCommand_checkfail(float request, string command) // used only by client side code
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       print(sprintf("CHECKFAIL: %s (%s) epically failed check %s\n", self.netname, self.netaddress, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1))));
+                       self.checkfail = 1;
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd checkfail message\n");
+                       sprint(self, "  Where 'message' is the message reported by client about the fail.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_clientversion(float request, float argc) // used only by client side code
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(self.flags & FL_CLIENT)
+                       {
+                               self.version = ((argv(1) == "$gameversion") ? 1 : stof(argv(1)));
+                               
+                               if(self.version < autocvar_gameversion_min || self.version > autocvar_gameversion_max)
+                               {
+                                       self.version_mismatch = 1;
+                                       ClientKill_TeamChange(-2); // observe
+                               } 
+                               else if(autocvar_g_campaign || autocvar_g_balance_teams || autocvar_g_balance_teams_force) 
+                               {
+                                       //JoinBestTeam(self, FALSE, TRUE);
+                               } 
+                               else if(teamplay && !autocvar_sv_spectate && !(self.team_forced > 0)) 
+                               {
+                                       self.classname = "observer"; // really?
+                                       stuffcmd(self, "menu_showteamselect\n");
+                               }
+                       }
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd clientversion version\n");
+                       sprint(self, "  Where 'version' is the game version reported by self.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_cvar_changes(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       sprint(self, cvar_changes);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 sv_cmd cvar_changes\n");
+                       sprint(self, "  No arguments required.\n");
+                       //sprint(self, "See also: ^2cvar_purechanges^7\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_cvar_purechanges(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       sprint(self, cvar_purechanges);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 sv_cmd cvar_purechanges\n");
+                       sprint(self, "  No arguments required.\n");
+                       //sprint(self, "See also: ^2cvar_changes^7\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_getmapvotepic(float request, float argc)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(intermission_running)                                
+                               MapVote_SendPicture(stof(argv(1)));
+
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd getmapvotepic mapid\n");
+                       sprint(self, "  Where 'mapid' is the id number of the map to request an image of on the map vote selection menu.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_info(float request, float argc)
+{      
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       string command;
+                       
+                       command = builtin_cvar_string(strcat("sv_info_", argv(1))); 
+                       if(command)
+                               wordwrap_sprint(command, 1111); // why 1111?
+                       else
+                               sprint(self, "ERROR: unsupported info command\n");
+                               
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd info request\n");
+                       sprint(self, "  Where 'request' is the suffixed string appended onto the request for cvar.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_join(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(self.flags & FL_CLIENT)
+                       {
+                               if(self.classname != "player" && !lockteams && !g_arena)
+                               {
+                                       if(nJoinAllowed(1)) 
+                                       {
+                                               if(g_ca) { self.caplayer = 1; }
+                                               if(autocvar_g_campaign) { campaign_bots_may_start = 1; }
+                                               
+                                               self.classname = "player";
+                                               PlayerScore_Clear(self);
+                                               bprint ("^4", self.netname, "^4 is playing now\n");
+                                               PutClientInServer();
+                                       }
+                                       else 
+                                       {
+                                               //player may not join because of g_maxplayers is set
+                                               centerprint(self, PREVENT_JOIN_TEXT);
+                                       }
+                               }
+                       }
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd join\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_ladder(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       sprint(self, ladder_reply);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd ladder\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_lsmaps(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       sprint(self, lsmaps_reply);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd lsmaps\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_lsnewmaps(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       sprint(self, lsnewmaps_reply);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd lsnewmaps\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_maplist(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       sprint(self, maplist_reply);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd maplist\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_rankings(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       sprint(self, rankings_reply);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd rankings\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_ready(float request) 
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(self.flags & FL_CLIENT)
+                       {
+                               if(inWarmupStage || autocvar_sv_ready_restart || g_race_qualifying == 2)
+                               {
+                                       if(!readyrestart_happened || autocvar_sv_ready_restart_repeatable)
+                                       {
+                                               if (self.ready) // toggle
+                                               {
+                                                       self.ready = FALSE;
+                                                       bprint(self.netname, "^2 is ^1NOT^2 ready\n");
+                                               }
+                                               else
+                                               {
+                                                       self.ready = TRUE;
+                                                       bprint(self.netname, "^2 is ready\n");
+                                               }
+
+                                               // cannot reset the game while a timeout is active!
+                                               if(!timeoutStatus)
+                                                       ReadyCount();
+                                       } else {
+                                               sprint(self, "^1Game has already been restarted\n");
+                                       }
+                               }
+                       }
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd ready\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_records(float request) // TODO: Isn't this flooding with the sprint messages? Old code, but perhaps bad?
+{      
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       float i;
+                       
+                       for(i = 0; i < 10; ++i)
+                               sprint(self, records_reply[i]);
+                               
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd records\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_reportcvar(float request, float argc, string command) // TODO: confirm this works
+{      
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       float tokens;
+                       string s;
+                       
+                       if(substring(argv(2), 0, 1) == "$") // undefined cvar: use the default value on the server then
+                       {
+                               s = strcat(substring(command, argv_start_index(0), argv_end_index(1) - argv_start_index(0)), " \"", cvar_defstring(argv(1)), "\"");
+                               tokens = tokenize_console(s);
+                       }
+                       GetCvars(1);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd reportcvar <cvar>\n");
+                       sprint(self, "  Where 'cvar' is the cvar plus arguments to send to the server.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_say(float request, float argc, string command)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(argc >= 2) { Say(self, FALSE, world, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); }
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd say <message>\n");
+                       sprint(self, "  Where 'message' is the string of text to say.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_say_team(float request, float argc, string command)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(argc >= 2) { Say(self, TRUE, world, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); }
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd say_team <message>\n");
+                       sprint(self, "  Where 'message' is the string of text to say.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_selectteam(float request, float argc) // TODO: Update the messages for this command
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       float selection;
+                       
+                       if (self.flags & FL_CLIENT)
+                       {
+                               if(teamplay)
+                                       if not(self.team_forced > 0) 
+                                               if not(lockteams) 
+                                               {
+                                                       switch(argv(1))
+                                                       {
+                                                               case "red": selection = COLOR_TEAM1; break;
+                                                               case "blue": selection = COLOR_TEAM2; break;
+                                                               case "yellow": selection = COLOR_TEAM3; break;
+                                                               case "pink": selection = COLOR_TEAM4; break;
+                                                               case "auto": selection = (-1); break;
+                                                               
+                                                               default: break;
+                                                       }
+                                                       
+                                                       if(selection)
+                                                       {
+                                                               if(self.team == selection && self.deadflag == DEAD_NO)
+                                                                       sprint(self, "^7You already are on that team.\n");
+                                                               else if(self.wasplayer && autocvar_g_changeteam_banned)
+                                                                       sprint(self, "^1You cannot change team, forbidden by the server.\n");
+                                                               else
+                                                                       ClientKill_TeamChange(selection);
+                                                       }
+                                               }
+                                               else
+                                                       sprint(self, "^7The game has already begun, you must wait until the next map to be able to join a team.\n");
+                                       else
+                                               sprint(self, "^7selectteam can not be used as your team is forced\n");
+                               else
+                                       sprint(self, "^7selectteam can only be used in teamgames\n");
+                       }
+                       return; // never fall through to usage
+               }
+
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       //sprint(self, strcat( "selectteam none/red/blue/yellow/pink/auto - \"", argv(1), "\" not recognised\n" ) );
+                       sprint(self, "\nUsage:^3 cmd selectteam team\n");
+                       sprint(self, "  Where 'team' is the prefered team to try and join.\n");
+                       sprint(self, "  Full list of options here: \"red, blue, yellow, pink, auto\"\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_selfstuff(float request, string command)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       stuffcmd(self, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)));
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd selfstuff command\n");
+                       sprint(self, "  Where 'command' is the string to be stuffed to your client.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_sentcvar(float request, float argc, string command)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       float tokens;
+                       string s;
+                       
+                       if(argc == 2) // undefined cvar: use the default value on the server then
+                       {
+                               s = strcat(substring(command, argv_start_index(0), argv_end_index(1) - argv_start_index(0)), " \"", cvar_defstring(argv(1)), "\"");
+                               tokens = tokenize_console(s);
+                       }
+                       GetCvars(1);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd sentcvar <cvar>\n");
+                       sprint(self, "  Where 'cvar' is the cvar plus arguments to send to the server.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_spectate(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(self.flags & FL_CLIENT)
+                       {
+                               if(g_arena) { return; } 
+                               if(g_lms)
+                               {
+                                       if(self.lms_spectate_warning)
+                                       {
+                                               // mark player as spectator
+                                               PlayerScore_Add(self, SP_LMS_RANK, 666 - PlayerScore_Add(self, SP_LMS_RANK, 0));
+                                       }
+                                       else
+                                       {
+                                               self.lms_spectate_warning = 1;
+                                               sprint(self, "WARNING: you won't be able to enter the game again after spectating in LMS. Use the same command again to spectate anyway.\n");
+                                               return;
+                                       }
+                               }
+                               
+                               if(self.classname == "player" && autocvar_sv_spectate == 1) 
+                                       ClientKill_TeamChange(-2); // observe
+                               
+                               // in CA, allow a dead player to move to spectatators (without that, caplayer!=0 will be moved back to the player list)
+                               // note: if arena game mode is ever done properly, this needs to be removed.
+                               if(g_ca && self.caplayer && (self.classname == "spectator" || self.classname == "observer"))
+                               {
+                                       sprint(self, "WARNING: you will spectate in the next round.\n");
+                                       self.caplayer = 0;
+                               }
+                       }
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd spectate\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_suggestmap(float request, float argc)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       sprint(self, strcat(MapVote_Suggest(argv(1)), "\n"));
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd suggestmap map\n");
+                       sprint(self, "  Where 'map' is the name of the map to suggest.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_teamstatus(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       Score_NicePrint(self);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd teamstatus\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_tell(float request, float argc, string command)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       entity e = GetCommandPlayerSlotTargetFromTokenizedCommand(argc, 1);
+                       
+                       if(e && argc > ParseCommandPlayerSlotTarget_firsttoken)
+                       {
+                               Say(self, FALSE, e, substring(command, argv_start_index(ParseCommandPlayerSlotTarget_firsttoken), argv_end_index(-1) - argv_start_index(ParseCommandPlayerSlotTarget_firsttoken)), TRUE);
+                       }
+                       else
+                       {
+                               if(argc > ParseCommandPlayerSlotTarget_firsttoken)
+                                       trigger_magicear_processmessage_forallears(self, -1, world, substring(command, argv_start_index(ParseCommandPlayerSlotTarget_firsttoken), argv_end_index(-1) - argv_start_index(ParseCommandPlayerSlotTarget_firsttoken)));
+                       }
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd tell playerid <message>\n");
+                       sprint(self, "  Where 'playerid' is the entity number of the player to send the 'message' to.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_timein(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(self.flags & FL_CLIENT)
+                       {
+                               if(autocvar_sv_timeout)
+                               {
+                                       if (!timeoutStatus)
+                                               return sprint(self, "^7Error: There is no active timeout which could be aborted!\n");
+                                       if (self != timeoutInitiator)
+                                               return sprint(self, "^7Error: You may not abort the active timeout. Only the player who called it can do that!\n");
+                                               
+                                       if (timeoutStatus == 1) 
+                                       {
+                                               remainingTimeoutTime = timeoutStatus = 0;
+                                               timeoutHandler.nextthink = time; //timeoutHandler has to take care of it immediately
+                                               bprint(strcat("^7The timeout was aborted by ", self.netname, " !\n"));
+                                       }
+                                       else if (timeoutStatus == 2) 
+                                       {
+                                               //only shorten the remainingTimeoutTime if it makes sense
+                                               if( remainingTimeoutTime > (autocvar_sv_timeout_resumetime + 1) ) 
+                                               {
+                                                       bprint(strcat("^1Attention: ^7", self.netname, " resumed the game! Prepare for battle!\n"));
+                                                       remainingTimeoutTime = autocvar_sv_timeout_resumetime;
+                                                       timeoutHandler.nextthink = time; //timeoutHandler has to take care of it immediately
+                                               }
+                                               else
+                                                       sprint(self, "^7Error: Your resumegame call was discarded!\n");
+                                       }
+                               }
+                       }
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd timein\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_timeout(float request) // DEAR GOD THIS COMMAND IS TERRIBLE.
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(self.flags & FL_CLIENT)
+                       {
+                               if(autocvar_sv_timeout) 
+                               {
+                                       if(self.classname == "player") 
+                                       {
+                                               if(votecalled)
+                                                       sprint(self, "^7Error: you can not call a timeout while a vote is active!\n");
+                                               else
+                                               {
+                                                       if (inWarmupStage && !g_warmup_allow_timeout)
+                                                               return sprint(self, "^7Error: You can not call a timeout in warmup-stage!\n");
+                                                       if (time < game_starttime )
+                                                               return sprint(self, "^7Error: You can not call a timeout while the map is being restarted!\n");
+                                                               
+                                                       if (timeoutStatus != 2) {
+                                                               //if the map uses a timelimit make sure that timeout cannot be called right before the map ends
+                                                               if (autocvar_timelimit) {
+                                                                       //a timelimit was used
+                                                                       float myTl;
+                                                                       myTl = autocvar_timelimit;
+
+                                                                       float lastPossibleTimeout;
+                                                                       lastPossibleTimeout = (myTl*60) - autocvar_sv_timeout_leadtime - 1;
+
+                                                                       if (lastPossibleTimeout < time - game_starttime)
+                                                                               return sprint(self, "^7Error: It is too late to call a timeout now!\n");
+                                                               }
+                                                       }
+                                                       
+                                                       //player may not call a timeout if he has no calls left
+                                                       if (self.allowedTimeouts < 1)
+                                                               return sprint(self, "^7Error: You already used all your timeout calls for this map!\n");
+                                                               
+                                                               
+                                                       //now all required checks are passed
+                                                       self.allowedTimeouts -= 1;
+                                                       bprint(self.netname, " ^7called a timeout (", ftos(self.allowedTimeouts), " timeouts left)!\n"); //write a bprint who started the timeout (and how many he has left)
+                                                       remainingTimeoutTime = autocvar_sv_timeout_length;
+                                                       remainingLeadTime = autocvar_sv_timeout_leadtime;
+                                                       timeoutInitiator = self;
+                                                       if (timeoutStatus == 0) { //if another timeout was already active, don't change its status (which was 1 or 2) to 1, only change it to 1 if no timeout was active yet
+                                                               timeoutStatus = 1;
+                                                               //create the timeout indicator which centerprints the information to all players and takes care of pausing/unpausing
+                                                               timeoutHandler = spawn();
+                                                               timeoutHandler.think = timeoutHandler_Think;
+                                                       }
+                                                       timeoutHandler.nextthink = time; //always let the entity think asap
+
+                                                       //inform all connected clients about the timeout call
+                                                       Announce("timeoutcalled");
+                                               }
+                                       }
+                                       else
+                                               sprint(self, "^7Error: only players can call a timeout!\n");
+                               }
+                       }
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd timeout\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_voice(float request, float argc, string command)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(argc >= 3)
+                               VoiceMessage(argv(1), substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2)));
+                       else
+                               VoiceMessage(argv(1), "");
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd voice\n");
+                       sprint(self, "  FIXME ARGUMENTS UNKNOWN.\n");
+                       return;
+               }
+       }
+}
+
+string strlimitedlen(string input, float strip_colors, float limit)
+{
+       if(strlen((strip_colors ? strdecolorize(input) : input)) <= limit)
+               return input;
+       else
+               return strcat(substring(input, 0, (strlen(input) - 3)), "...");
+}
+
+void ClientCommand_who(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       float total_listed_players, tmp_hours, tmp_minutes, tmp_seconds;
+                       entity tmp_player;
+                       string tmp_player_name;
+                       
+                       sprint(self, strcat("List of client information", (autocvar_sv_status_privacy ? " (some data is hidden for privacy)" : string_null), ":\n"));
+                       sprint(self, sprintf(" %-4s %-20s %-5s %-3s %-9s %-16s %s\n", "ent", "nickname", "ping", "pl", "time", "ip", "crypto_id"));
+                       
+                       FOR_EACH_CLIENT(tmp_player)
+                       {
+                               tmp_player_name = strlimitedlen(tmp_player.netname, TRUE, 20);
+                               
+                               tmp_hours = tmp_minutes = tmp_seconds = 0;
+                               
+                               tmp_seconds = (time - tmp_player.jointime);
+                               tmp_minutes = (tmp_seconds / 60);
+                               
+                               if(tmp_minutes)
+                               {
+                                       tmp_seconds -= (tmp_minutes * 60);
+                                       tmp_hours = (tmp_minutes / 60);
+                                       
+                                       if(tmp_hours) { tmp_minutes -= (tmp_hours * 60); }
+                               }
+                               
+                               sprint(self, sprintf(" %-4s %-20s %-5d %-3d %-9s %-16s %s\n", 
+                                       strcat("#", ftos(num_for_edict(tmp_player))), 
+                                       tmp_player.netname, //strcat(tmp_player_name, sprintf("%*s", (20 - strlen(strdecolorize(tmp_player_name))), "")),
+                                       tmp_player.ping, tmp_player.ping_packetloss, 
+                                       sprintf("%02d:%02d:%02d", tmp_hours, tmp_minutes, tmp_seconds),
+                                       (autocvar_sv_status_privacy ? "hidden" : tmp_player.netaddress),
+                                       (autocvar_sv_status_privacy ? "hidden" : tmp_player.crypto_idfp)));
+                                       
+                               ++total_listed_players;
+                       }
+                       
+                       sprint(self, strcat("Finished listing ", ftos(total_listed_players), " client(s). \n"));
+                       
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd who\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+/* use this when creating a new command, making sure to place it in alphabetical order.
+void ClientCommand_(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd \n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+*/
+
+
+// =====================================
+//  Macro system for networked commands
+// =====================================
+
+// Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
+#define CLIENT_COMMANDS(request,arguments,command) \
+       CLIENT_COMMAND("autoswitch", ClientCommand_autoswitch(request, arguments), "Whether or not to switch automatically when getting a better weapon") \
+       CLIENT_COMMAND("checkfail", ClientCommand_checkfail(request, command), "Report if a client-side check failed") \
+       CLIENT_COMMAND("clientversion", ClientCommand_clientversion(request, arguments), "Release version of the game") \
+       CLIENT_COMMAND("cvar_changes", ClientCommand_cvar_changes(request), "Prints a list of all changed server cvars") \
+       CLIENT_COMMAND("cvar_purechanges", ClientCommand_cvar_purechanges(request), "Prints a list of all changed gameplay cvars") \
+       CLIENT_COMMAND("getmapvotepic", ClientCommand_getmapvotepic(request, arguments), "Retrieve mapshot picture from the server") \
+       CLIENT_COMMAND("info", ClientCommand_info(request, arguments), "Request for unique server information set up by admin") \
+       CLIENT_COMMAND("join", ClientCommand_join(request), "Become a player in the game") \
+       CLIENT_COMMAND("ladder", ClientCommand_ladder(request), "Get information about top players if supported") \
+       CLIENT_COMMAND("lsmaps", ClientCommand_lsmaps(request), "List maps which can be used with the current game mode") \
+       CLIENT_COMMAND("lsnewmaps", ClientCommand_lsnewmaps(request), "List maps which TODO") \
+       CLIENT_COMMAND("maplist", ClientCommand_maplist(request), "Full server maplist reply") \
+       CLIENT_COMMAND("rankings", ClientCommand_rankings(request), "Print information about rankings") \
+       CLIENT_COMMAND("ready", ClientCommand_ready(request), "Qualify as ready to end warmup stage (or restart server if allowed)") \
+       CLIENT_COMMAND("records", ClientCommand_records(request), "List top 10 records for the current map") \
+       CLIENT_COMMAND("reportcvar", ClientCommand_reportcvar(request, arguments, command), "Old system for sending a client cvar to the server") \
+       CLIENT_COMMAND("say", ClientCommand_say(request, arguments, command), "Print a message to chat to all players") \
+       CLIENT_COMMAND("say_team", ClientCommand_say_team(request, arguments, command), "Print a message to chat to all team mates") \
+       CLIENT_COMMAND("selectteam", ClientCommand_selectteam(request, arguments), "Attempt to choose a team to join into") \
+       CLIENT_COMMAND("selfstuff", ClientCommand_selfstuff(request, command), "Stuffcmd a command to your own client") \
+       CLIENT_COMMAND("sentcvar", ClientCommand_sentcvar(request, arguments, command), "New system for sending a client cvar to the server") \
+       CLIENT_COMMAND("spectate", ClientCommand_spectate(request), "Become an observer") \
+       CLIENT_COMMAND("suggestmap", ClientCommand_suggestmap(request, arguments), "Suggest a map to the mapvote at match end") \
+       CLIENT_COMMAND("teamstatus", ClientCommand_teamstatus(request), "Print detailed score information for all players") \
+       CLIENT_COMMAND("tell", ClientCommand_tell(request, arguments, command), "Send a message directly to a player") \
+       CLIENT_COMMAND("timein", ClientCommand_timein(request), "Resume the game from being paused with a timeout") \
+       CLIENT_COMMAND("timeout", ClientCommand_timeout(request), "Call a timeout which pauses the game for certain amount of time unless unpaused") \
+       CLIENT_COMMAND("voice", ClientCommand_voice(request, arguments, command), "Send voice message via sound") \
+       CLIENT_COMMAND("vote", VoteCommand(request, self, arguments, command), "Request an action to be voted upon by players") \
+       CLIENT_COMMAND("who", ClientCommand_who(request), "Display detailed client information about all players") \
+       /* nothing */
+       
+void ClientCommand_macro_help()
+{
+       #define CLIENT_COMMAND(name,function,description) \
+               { print("  ^2", name, "^7: ", description, "\n"); }
+               
+       CLIENT_COMMANDS(0, 0, "")
+       #undef CLIENT_COMMAND
+       
+       return;
+}
+
+float ClientCommand_macro_command(float argc, string command)
+{
+       #define CLIENT_COMMAND(name,function,description) \
+               { if(name == strtolower(argv(0))) { function; return TRUE; } }
+               
+       CLIENT_COMMANDS(CC_REQUEST_COMMAND, argc, command)
+       #undef CLIENT_COMMAND
+       
+       return FALSE;
+}
+
+float ClientCommand_macro_usage(float argc, string command)
+{
+       #define CLIENT_COMMAND(name,function,description) \
+               { if(name == strtolower(argv(1))) { function; return TRUE; } }
+               
+       CLIENT_COMMANDS(CC_REQUEST_USAGE, argc, command)
+       #undef CLIENT_COMMAND
+       
+       return FALSE;
+}
+
+
+// ======================================
+//  Main Function Called By Engine (cmd)
+// ======================================
+// If this function exists, server game code parses clientcommand before the engine code gets it.
+
+void SV_ParseClientCommand(string command)
+{
+       float argc = tokenize_console(command);
+       
+       // for floodcheck
+       switch(strtolower(argv(0)))
+       {
+               // exempt commands which are not subject to floodcheck
+               case "begin": break; // handled by engine in host_cmd.c
+               case "getmapvotepic": break; // handled by server in this file
+               case "pause": break; // handled by engine in host_cmd.c
+               case "prespawn": break; // handled by engine in host_cmd.c
+               case "reportcvar": break; // handled by server in this file
+               case "sentcvar": break; // handled by server in this file
+               case "spawn": break; // handled by engine in host_cmd.c
+               
+               default: 
+                       if(SV_ParseClientCommand_floodcheck())
+                               break; // "TRUE": continue, as we're not flooding yet
+                       else
+                               return; // "FALSE": not allowed to continue, halt
+       }
+       
+       /* NOTE: totally disabled for now, however the functionality and descriptions are there if we ever want it.
+       if(argv(0) == "help") 
+       {
+               if(argc == 1) 
+               {
+                       sprint(self, "\nUsage:^3 cmd COMMAND...^7, where possible commands are:\n");
+                       ClientCommand_macro_help;
+                       sprint(self, "For help about specific commands, type cmd help COMMAND\n");
+                       return;
+               } 
+               else if(ClientCommand_macro_usage(argc, command)) // Instead of trying to call a command, we're going to see detailed information about it
+               {
+                       return;
+               }
+       } 
+       else*/ if(MUTATOR_CALLHOOK(SV_ParseClientCommand))
+       {
+               return; // handled by a mutator
+       }
+       else if(CheatCommand(argc)) 
+       {
+               return; // handled by server/cheats.qc
+       }
+       else if(ClientCommand_macro_command(argc, command)) // continue as usual and scan for normal commands
+       {
+               return; // handled by one of the above GameCommand_* functions
+       }
+       else
+               clientcommand(self, command);
+}
\ No newline at end of file
diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc
new file mode 100644 (file)
index 0000000..86ff171
--- /dev/null
@@ -0,0 +1,1079 @@
+// =========================================================
+//  Server side networked commands code, reworked by Samual
+//  Last updated: December 11th, 2011
+// =========================================================
+
+#define CC_REQUEST_COMMAND 1
+#define CC_REQUEST_USAGE 2
+
+.float cmd_floodtime;
+.float cmd_floodcount;
+.float checkfail;
+.float lms_spectate_warning;
+
+string MapVote_Suggest(string m);
+//void MapVote_SendPicture(float id)
+
+// move any necessary sprint statements to "print_to"
+
+// ============================
+//  Misc. Supporting Functions
+// ============================
+
+float SV_ParseClientCommand_floodcheck()
+{
+       if (timeoutStatus != 2) // if the game is not paused... but wait, doesn't that mean it could be dos'd by pausing it? eh? (old code)
+       {
+               if(time <= (self.cmd_floodtime + autocvar_sv_clientcommand_antispam_time))
+               {
+                       self.cmd_floodcount += 1;
+                       if(self.cmd_floodcount > autocvar_sv_clientcommand_antispam_count) { return FALSE; } // too much spam, halt
+               }
+               else
+               {
+                       self.cmd_floodtime = time;
+                       self.cmd_floodcount = 1;
+               }
+       }
+       return TRUE; // continue, as we're not flooding yet
+}
+
+
+// =======================
+//  Command Sub-Functions
+// =======================
+
+void ClientCommand_autoswitch(float request, float argc)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       self.autoswitch = ("0" != argv(1));
+                       sprint(self, strcat("^1autoswitch is currently turned ", (self.autoswitch ? "on" : "off"), ".\n"));
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd autoswitch selection\n");
+                       sprint(self, "  Where 'selection' is 1 or 0 for on or off.\n"); 
+                       return;
+               }
+       }
+}
+
+void ClientCommand_checkfail(float request, string command) // used only by client side code
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       print(sprintf("CHECKFAIL: %s (%s) epically failed check %s\n", self.netname, self.netaddress, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1))));
+                       self.checkfail = 1;
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd checkfail message\n");
+                       sprint(self, "  Where 'message' is the message reported by client about the fail.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_clientversion(float request, float argc) // used only by client side code
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(self.flags & FL_CLIENT)
+                       {
+                               self.version = ((argv(1) == "$gameversion") ? 1 : stof(argv(1)));
+                               
+                               if(self.version < autocvar_gameversion_min || self.version > autocvar_gameversion_max)
+                               {
+                                       self.version_mismatch = 1;
+                                       ClientKill_TeamChange(-2); // observe
+                               } 
+                               else if(autocvar_g_campaign || autocvar_g_balance_teams || autocvar_g_balance_teams_force) 
+                               {
+                                       //JoinBestTeam(self, FALSE, TRUE);
+                               } 
+                               else if(teamplay && !autocvar_sv_spectate && !(self.team_forced > 0)) 
+                               {
+                                       self.classname = "observer"; // really?
+                                       stuffcmd(self, "menu_showteamselect\n");
+                               }
+                       }
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd clientversion version\n");
+                       sprint(self, "  Where 'version' is the game version reported by self.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_cvar_changes(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       sprint(self, cvar_changes);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 sv_cmd cvar_changes\n");
+                       sprint(self, "  No arguments required.\n");
+                       //sprint(self, "See also: ^2cvar_purechanges^7\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_cvar_purechanges(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       sprint(self, cvar_purechanges);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 sv_cmd cvar_purechanges\n");
+                       sprint(self, "  No arguments required.\n");
+                       //sprint(self, "See also: ^2cvar_changes^7\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_getmapvotepic(float request, float argc)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(intermission_running)                                
+                               MapVote_SendPicture(stof(argv(1)));
+
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd getmapvotepic mapid\n");
+                       sprint(self, "  Where 'mapid' is the id number of the map to request an image of on the map vote selection menu.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_info(float request, float argc)
+{      
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       string command;
+                       
+                       command = builtin_cvar_string(strcat("sv_info_", argv(1))); 
+                       if(command)
+                               wordwrap_sprint(command, 1111); // why 1111?
+                       else
+                               sprint(self, "ERROR: unsupported info command\n");
+                               
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd info request\n");
+                       sprint(self, "  Where 'request' is the suffixed string appended onto the request for cvar.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_join(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(self.flags & FL_CLIENT)
+                       {
+                               if(self.classname != "player" && !lockteams && !g_arena)
+                               {
+                                       if(nJoinAllowed(1)) 
+                                       {
+                                               if(g_ca) { self.caplayer = 1; }
+                                               if(autocvar_g_campaign) { campaign_bots_may_start = 1; }
+                                               
+                                               self.classname = "player";
+                                               PlayerScore_Clear(self);
+                                               bprint ("^4", self.netname, "^4 is playing now\n");
+                                               PutClientInServer();
+                                       }
+                                       else 
+                                       {
+                                               //player may not join because of g_maxplayers is set
+                                               centerprint(self, PREVENT_JOIN_TEXT);
+                                       }
+                               }
+                       }
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd join\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_ladder(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       sprint(self, ladder_reply);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd ladder\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_lsmaps(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       sprint(self, lsmaps_reply);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd lsmaps\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_lsnewmaps(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       sprint(self, lsnewmaps_reply);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd lsnewmaps\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_maplist(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       sprint(self, maplist_reply);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd maplist\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_rankings(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       sprint(self, rankings_reply);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd rankings\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_ready(float request) 
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(self.flags & FL_CLIENT)
+                       {
+                               if(inWarmupStage || autocvar_sv_ready_restart || g_race_qualifying == 2)
+                               {
+                                       if(!readyrestart_happened || autocvar_sv_ready_restart_repeatable)
+                                       {
+                                               if (self.ready) // toggle
+                                               {
+                                                       self.ready = FALSE;
+                                                       bprint(self.netname, "^2 is ^1NOT^2 ready\n");
+                                               }
+                                               else
+                                               {
+                                                       self.ready = TRUE;
+                                                       bprint(self.netname, "^2 is ready\n");
+                                               }
+
+                                               // cannot reset the game while a timeout is active!
+                                               if(!timeoutStatus)
+                                                       ReadyCount();
+                                       } else {
+                                               sprint(self, "^1Game has already been restarted\n");
+                                       }
+                               }
+                       }
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd ready\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_records(float request) // TODO: Isn't this flooding with the sprint messages? Old code, but perhaps bad?
+{      
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       float i;
+                       
+                       for(i = 0; i < 10; ++i)
+                               sprint(self, records_reply[i]);
+                               
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd records\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_reportcvar(float request, float argc, string command) // TODO: confirm this works
+{      
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       float tokens;
+                       string s;
+                       
+                       if(substring(argv(2), 0, 1) == "$") // undefined cvar: use the default value on the server then
+                       {
+                               s = strcat(substring(command, argv_start_index(0), argv_end_index(1) - argv_start_index(0)), " \"", cvar_defstring(argv(1)), "\"");
+                               tokens = tokenize_console(s);
+                       }
+                       GetCvars(1);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd reportcvar <cvar>\n");
+                       sprint(self, "  Where 'cvar' is the cvar plus arguments to send to the server.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_say(float request, float argc, string command)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(argc >= 2) { Say(self, FALSE, world, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); }
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd say <message>\n");
+                       sprint(self, "  Where 'message' is the string of text to say.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_say_team(float request, float argc, string command)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(argc >= 2) { Say(self, TRUE, world, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); }
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd say_team <message>\n");
+                       sprint(self, "  Where 'message' is the string of text to say.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_selectteam(float request, float argc) // TODO: Update the messages for this command
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       float selection;
+                       
+                       if (self.flags & FL_CLIENT)
+                       {
+                               if(teamplay)
+                                       if not(self.team_forced > 0) 
+                                               if not(lockteams) 
+                                               {
+                                                       switch(argv(1))
+                                                       {
+                                                               case "red": selection = COLOR_TEAM1; break;
+                                                               case "blue": selection = COLOR_TEAM2; break;
+                                                               case "yellow": selection = COLOR_TEAM3; break;
+                                                               case "pink": selection = COLOR_TEAM4; break;
+                                                               case "auto": selection = (-1); break;
+                                                               
+                                                               default: break;
+                                                       }
+                                                       
+                                                       if(selection)
+                                                       {
+                                                               if(self.team == selection && self.deadflag == DEAD_NO)
+                                                                       sprint(self, "^7You already are on that team.\n");
+                                                               else if(self.wasplayer && autocvar_g_changeteam_banned)
+                                                                       sprint(self, "^1You cannot change team, forbidden by the server.\n");
+                                                               else
+                                                                       ClientKill_TeamChange(selection);
+                                                       }
+                                               }
+                                               else
+                                                       sprint(self, "^7The game has already begun, you must wait until the next map to be able to join a team.\n");
+                                       else
+                                               sprint(self, "^7selectteam can not be used as your team is forced\n");
+                               else
+                                       sprint(self, "^7selectteam can only be used in teamgames\n");
+                       }
+                       return; // never fall through to usage
+               }
+
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       //sprint(self, strcat( "selectteam none/red/blue/yellow/pink/auto - \"", argv(1), "\" not recognised\n" ) );
+                       sprint(self, "\nUsage:^3 cmd selectteam team\n");
+                       sprint(self, "  Where 'team' is the prefered team to try and join.\n");
+                       sprint(self, "  Full list of options here: \"red, blue, yellow, pink, auto\"\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_selfstuff(float request, string command)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       stuffcmd(self, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)));
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd selfstuff command\n");
+                       sprint(self, "  Where 'command' is the string to be stuffed to your client.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_sentcvar(float request, float argc, string command)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       float tokens;
+                       string s;
+                       
+                       if(argc == 2) // undefined cvar: use the default value on the server then
+                       {
+                               s = strcat(substring(command, argv_start_index(0), argv_end_index(1) - argv_start_index(0)), " \"", cvar_defstring(argv(1)), "\"");
+                               tokens = tokenize_console(s);
+                       }
+                       GetCvars(1);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd sentcvar <cvar>\n");
+                       sprint(self, "  Where 'cvar' is the cvar plus arguments to send to the server.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_spectate(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(self.flags & FL_CLIENT)
+                       {
+                               if(g_arena) { return; } 
+                               if(g_lms)
+                               {
+                                       if(self.lms_spectate_warning)
+                                       {
+                                               // mark player as spectator
+                                               PlayerScore_Add(self, SP_LMS_RANK, 666 - PlayerScore_Add(self, SP_LMS_RANK, 0));
+                                       }
+                                       else
+                                       {
+                                               self.lms_spectate_warning = 1;
+                                               sprint(self, "WARNING: you won't be able to enter the game again after spectating in LMS. Use the same command again to spectate anyway.\n");
+                                               return;
+                                       }
+                               }
+                               
+                               if(self.classname == "player" && autocvar_sv_spectate == 1) 
+                                       ClientKill_TeamChange(-2); // observe
+                               
+                               // in CA, allow a dead player to move to spectatators (without that, caplayer!=0 will be moved back to the player list)
+                               // note: if arena game mode is ever done properly, this needs to be removed.
+                               if(g_ca && self.caplayer && (self.classname == "spectator" || self.classname == "observer"))
+                               {
+                                       sprint(self, "WARNING: you will spectate in the next round.\n");
+                                       self.caplayer = 0;
+                               }
+                       }
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd spectate\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_suggestmap(float request, float argc)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       sprint(self, strcat(MapVote_Suggest(argv(1)), "\n"));
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd suggestmap map\n");
+                       sprint(self, "  Where 'map' is the name of the map to suggest.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_teamstatus(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       Score_NicePrint(self);
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd teamstatus\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_tell(float request, float argc, string command)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       entity e = GetCommandPlayerSlotTargetFromTokenizedCommand(argc, 1);
+                       
+                       if(e && argc > ParseCommandPlayerSlotTarget_firsttoken)
+                       {
+                               Say(self, FALSE, e, substring(command, argv_start_index(ParseCommandPlayerSlotTarget_firsttoken), argv_end_index(-1) - argv_start_index(ParseCommandPlayerSlotTarget_firsttoken)), TRUE);
+                       }
+                       else
+                       {
+                               if(argc > ParseCommandPlayerSlotTarget_firsttoken)
+                                       trigger_magicear_processmessage_forallears(self, -1, world, substring(command, argv_start_index(ParseCommandPlayerSlotTarget_firsttoken), argv_end_index(-1) - argv_start_index(ParseCommandPlayerSlotTarget_firsttoken)));
+                       }
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd tell playerid <message>\n");
+                       sprint(self, "  Where 'playerid' is the entity number of the player to send the 'message' to.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_timein(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(self.flags & FL_CLIENT)
+                       {
+                               if(autocvar_sv_timeout)
+                               {
+                                       if (!timeoutStatus)
+                                               return sprint(self, "^7Error: There is no active timeout which could be aborted!\n");
+                                       if (self != timeoutInitiator)
+                                               return sprint(self, "^7Error: You may not abort the active timeout. Only the player who called it can do that!\n");
+                                               
+                                       if (timeoutStatus == 1) 
+                                       {
+                                               remainingTimeoutTime = timeoutStatus = 0;
+                                               timeoutHandler.nextthink = time; //timeoutHandler has to take care of it immediately
+                                               bprint(strcat("^7The timeout was aborted by ", self.netname, " !\n"));
+                                       }
+                                       else if (timeoutStatus == 2) 
+                                       {
+                                               //only shorten the remainingTimeoutTime if it makes sense
+                                               if( remainingTimeoutTime > (autocvar_sv_timeout_resumetime + 1) ) 
+                                               {
+                                                       bprint(strcat("^1Attention: ^7", self.netname, " resumed the game! Prepare for battle!\n"));
+                                                       remainingTimeoutTime = autocvar_sv_timeout_resumetime;
+                                                       timeoutHandler.nextthink = time; //timeoutHandler has to take care of it immediately
+                                               }
+                                               else
+                                                       sprint(self, "^7Error: Your resumegame call was discarded!\n");
+                                       }
+                               }
+                       }
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd timein\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_timeout(float request) // DEAR GOD THIS COMMAND IS TERRIBLE.
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(self.flags & FL_CLIENT)
+                       {
+                               if(autocvar_sv_timeout) 
+                               {
+                                       if(self.classname == "player") 
+                                       {
+                                               if(votecalled)
+                                                       sprint(self, "^7Error: you can not call a timeout while a vote is active!\n");
+                                               else
+                                               {
+                                                       if (inWarmupStage && !g_warmup_allow_timeout)
+                                                               return sprint(self, "^7Error: You can not call a timeout in warmup-stage!\n");
+                                                       if (time < game_starttime )
+                                                               return sprint(self, "^7Error: You can not call a timeout while the map is being restarted!\n");
+                                                               
+                                                       if (timeoutStatus != 2) {
+                                                               //if the map uses a timelimit make sure that timeout cannot be called right before the map ends
+                                                               if (autocvar_timelimit) {
+                                                                       //a timelimit was used
+                                                                       float myTl;
+                                                                       myTl = autocvar_timelimit;
+
+                                                                       float lastPossibleTimeout;
+                                                                       lastPossibleTimeout = (myTl*60) - autocvar_sv_timeout_leadtime - 1;
+
+                                                                       if (lastPossibleTimeout < time - game_starttime)
+                                                                               return sprint(self, "^7Error: It is too late to call a timeout now!\n");
+                                                               }
+                                                       }
+                                                       
+                                                       //player may not call a timeout if he has no calls left
+                                                       if (self.allowedTimeouts < 1)
+                                                               return sprint(self, "^7Error: You already used all your timeout calls for this map!\n");
+                                                               
+                                                               
+                                                       //now all required checks are passed
+                                                       self.allowedTimeouts -= 1;
+                                                       bprint(self.netname, " ^7called a timeout (", ftos(self.allowedTimeouts), " timeouts left)!\n"); //write a bprint who started the timeout (and how many he has left)
+                                                       remainingTimeoutTime = autocvar_sv_timeout_length;
+                                                       remainingLeadTime = autocvar_sv_timeout_leadtime;
+                                                       timeoutInitiator = self;
+                                                       if (timeoutStatus == 0) { //if another timeout was already active, don't change its status (which was 1 or 2) to 1, only change it to 1 if no timeout was active yet
+                                                               timeoutStatus = 1;
+                                                               //create the timeout indicator which centerprints the information to all players and takes care of pausing/unpausing
+                                                               timeoutHandler = spawn();
+                                                               timeoutHandler.think = timeoutHandler_Think;
+                                                       }
+                                                       timeoutHandler.nextthink = time; //always let the entity think asap
+
+                                                       //inform all connected clients about the timeout call
+                                                       Announce("timeoutcalled");
+                                               }
+                                       }
+                                       else
+                                               sprint(self, "^7Error: only players can call a timeout!\n");
+                               }
+                       }
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd timeout\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void ClientCommand_voice(float request, float argc, string command)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       if(argc >= 3)
+                               VoiceMessage(argv(1), substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2)));
+                       else
+                               VoiceMessage(argv(1), "");
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd voice\n");
+                       sprint(self, "  FIXME ARGUMENTS UNKNOWN.\n");
+                       return;
+               }
+       }
+}
+
+string strlimitedlen(string input, float strip_colors, float limit)
+{
+       if(strlen((strip_colors ? strdecolorize(input) : input)) <= limit)
+               return input;
+       else
+               return strcat(substring(input, 0, (strlen(input) - 3)), "...");
+}
+
+void ClientCommand_who(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       float total_listed_players, tmp_hours, tmp_minutes, tmp_seconds;
+                       entity tmp_player;
+                       string tmp_player_name;
+                       
+                       sprint(self, strcat("List of client information", (autocvar_sv_status_privacy ? " (some data is hidden for privacy)" : string_null), ":\n"));
+                       sprint(self, sprintf(" %-4s %-20s %-5s %-3s %-9s %-16s %s\n", "ent", "nickname", "ping", "pl", "time", "ip", "crypto_id"));
+                       
+                       FOR_EACH_CLIENT(tmp_player)
+                       {
+                               tmp_player_name = strlimitedlen(tmp_player.netname, TRUE, 20);
+                               
+                               tmp_hours = tmp_minutes = tmp_seconds = 0;
+                               
+                               tmp_seconds = (time - tmp_player.jointime);
+                               tmp_minutes = (tmp_seconds / 60);
+                               
+                               if(tmp_minutes)
+                               {
+                                       tmp_seconds -= (tmp_minutes * 60);
+                                       tmp_hours = (tmp_minutes / 60);
+                                       
+                                       if(tmp_hours) { tmp_minutes -= (tmp_hours * 60); }
+                               }
+                               
+                               sprint(self, sprintf(" %-4s %-20s %-5d %-3d %-9s %-16s %s\n", 
+                                       strcat("#", ftos(num_for_edict(tmp_player))), 
+                                       tmp_player.netname, //strcat(tmp_player_name, sprintf("%*s", (20 - strlen(strdecolorize(tmp_player_name))), "")),
+                                       tmp_player.ping, tmp_player.ping_packetloss, 
+                                       sprintf("%02d:%02d:%02d", tmp_hours, tmp_minutes, tmp_seconds),
+                                       (autocvar_sv_status_privacy ? "hidden" : tmp_player.netaddress),
+                                       (autocvar_sv_status_privacy ? "hidden" : tmp_player.crypto_idfp)));
+                                       
+                               ++total_listed_players;
+                       }
+                       
+                       sprint(self, strcat("Finished listing ", ftos(total_listed_players), " client(s). \n"));
+                       
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd who\n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+/* use this when creating a new command, making sure to place it in alphabetical order.
+void ClientCommand_(float request)
+{
+       switch(request)
+       {
+               case CC_REQUEST_COMMAND:
+               {
+                       
+                       return; // never fall through to usage
+               }
+                       
+               default:
+               case CC_REQUEST_USAGE:
+               {
+                       sprint(self, "\nUsage:^3 cmd \n");
+                       sprint(self, "  No arguments required.\n");
+                       return;
+               }
+       }
+}
+*/
+
+
+// =====================================
+//  Macro system for networked commands
+// =====================================
+
+// Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
+#define CLIENT_COMMANDS(request,arguments,command) \
+       CLIENT_COMMAND("autoswitch", ClientCommand_autoswitch(request, arguments), "Whether or not to switch automatically when getting a better weapon") \
+       CLIENT_COMMAND("checkfail", ClientCommand_checkfail(request, command), "Report if a client-side check failed") \
+       CLIENT_COMMAND("clientversion", ClientCommand_clientversion(request, arguments), "Release version of the game") \
+       CLIENT_COMMAND("cvar_changes", ClientCommand_cvar_changes(request), "Prints a list of all changed server cvars") \
+       CLIENT_COMMAND("cvar_purechanges", ClientCommand_cvar_purechanges(request), "Prints a list of all changed gameplay cvars") \
+       CLIENT_COMMAND("getmapvotepic", ClientCommand_getmapvotepic(request, arguments), "Retrieve mapshot picture from the server") \
+       CLIENT_COMMAND("info", ClientCommand_info(request, arguments), "Request for unique server information set up by admin") \
+       CLIENT_COMMAND("join", ClientCommand_join(request), "Become a player in the game") \
+       CLIENT_COMMAND("ladder", ClientCommand_ladder(request), "Get information about top players if supported") \
+       CLIENT_COMMAND("lsmaps", ClientCommand_lsmaps(request), "List maps which can be used with the current game mode") \
+       CLIENT_COMMAND("lsnewmaps", ClientCommand_lsnewmaps(request), "List maps which TODO") \
+       CLIENT_COMMAND("maplist", ClientCommand_maplist(request), "Full server maplist reply") \
+       CLIENT_COMMAND("rankings", ClientCommand_rankings(request), "Print information about rankings") \
+       CLIENT_COMMAND("ready", ClientCommand_ready(request), "Qualify as ready to end warmup stage (or restart server if allowed)") \
+       CLIENT_COMMAND("records", ClientCommand_records(request), "List top 10 records for the current map") \
+       CLIENT_COMMAND("reportcvar", ClientCommand_reportcvar(request, arguments, command), "Old system for sending a client cvar to the server") \
+       CLIENT_COMMAND("say", ClientCommand_say(request, arguments, command), "Print a message to chat to all players") \
+       CLIENT_COMMAND("say_team", ClientCommand_say_team(request, arguments, command), "Print a message to chat to all team mates") \
+       CLIENT_COMMAND("selectteam", ClientCommand_selectteam(request, arguments), "Attempt to choose a team to join into") \
+       CLIENT_COMMAND("selfstuff", ClientCommand_selfstuff(request, command), "Stuffcmd a command to your own client") \
+       CLIENT_COMMAND("sentcvar", ClientCommand_sentcvar(request, arguments, command), "New system for sending a client cvar to the server") \
+       CLIENT_COMMAND("spectate", ClientCommand_spectate(request), "Become an observer") \
+       CLIENT_COMMAND("suggestmap", ClientCommand_suggestmap(request, arguments), "Suggest a map to the mapvote at match end") \
+       CLIENT_COMMAND("teamstatus", ClientCommand_teamstatus(request), "Print detailed score information for all players") \
+       CLIENT_COMMAND("tell", ClientCommand_tell(request, arguments, command), "Send a message directly to a player") \
+       CLIENT_COMMAND("timein", ClientCommand_timein(request), "Resume the game from being paused with a timeout") \
+       CLIENT_COMMAND("timeout", ClientCommand_timeout(request), "Call a timeout which pauses the game for certain amount of time unless unpaused") \
+       CLIENT_COMMAND("voice", ClientCommand_voice(request, arguments, command), "Send voice message via sound") \
+       CLIENT_COMMAND("vote", VoteCommand(request, self, arguments, command), "Request an action to be voted upon by players") \
+       CLIENT_COMMAND("who", ClientCommand_who(request), "Display detailed client information about all players") \
+       /* nothing */
+       
+void ClientCommand_macro_help()
+{
+       #define CLIENT_COMMAND(name,function,description) \
+               { print("  ^2", name, "^7: ", description, "\n"); }
+               
+       CLIENT_COMMANDS(0, 0, "")
+       #undef CLIENT_COMMAND
+       
+       return;
+}
+
+float ClientCommand_macro_command(float argc, string command)
+{
+       #define CLIENT_COMMAND(name,function,description) \
+               { if(name == strtolower(argv(0))) { function; return TRUE; } }
+               
+       CLIENT_COMMANDS(CC_REQUEST_COMMAND, argc, command)
+       #undef CLIENT_COMMAND
+       
+       return FALSE;
+}
+
+float ClientCommand_macro_usage(float argc, string command)
+{
+       #define CLIENT_COMMAND(name,function,description) \
+               { if(name == strtolower(argv(1))) { function; return TRUE; } }
+               
+       CLIENT_COMMANDS(CC_REQUEST_USAGE, argc, command)
+       #undef CLIENT_COMMAND
+       
+       return FALSE;
+}
+
+
+// ======================================
+//  Main Function Called By Engine (cmd)
+// ======================================
+// If this function exists, server game code parses clientcommand before the engine code gets it.
+
+void SV_ParseClientCommand(string command)
+{
+       float argc = tokenize_console(command);
+       
+       // for floodcheck
+       switch(strtolower(argv(0)))
+       {
+               // exempt commands which are not subject to floodcheck
+               case "begin": break; // handled by engine in host_cmd.c
+               case "getmapvotepic": break; // handled by server in this file
+               case "pause": break; // handled by engine in host_cmd.c
+               case "prespawn": break; // handled by engine in host_cmd.c
+               case "reportcvar": break; // handled by server in this file
+               case "sentcvar": break; // handled by server in this file
+               case "spawn": break; // handled by engine in host_cmd.c
+               
+               default: 
+                       if(SV_ParseClientCommand_floodcheck())
+                               break; // "TRUE": continue, as we're not flooding yet
+                       else
+                               return; // "FALSE": not allowed to continue, halt
+       }
+       
+       /* NOTE: totally disabled for now, however the functionality and descriptions are there if we ever want it.
+       if(argv(0) == "help") 
+       {
+               if(argc == 1) 
+               {
+                       sprint(self, "\nUsage:^3 cmd COMMAND...^7, where possible commands are:\n");
+                       ClientCommand_macro_help;
+                       sprint(self, "For help about specific commands, type cmd help COMMAND\n");
+                       return;
+               } 
+               else if(ClientCommand_macro_usage(argc, command)) // Instead of trying to call a command, we're going to see detailed information about it
+               {
+                       return;
+               }
+       } 
+       else*/ if(MUTATOR_CALLHOOK(SV_ParseClientCommand))
+       {
+               return; // handled by a mutator
+       }
+       else if(CheatCommand(argc)) 
+       {
+               return; // handled by server/cheats.qc
+       }
+       else if(ClientCommand_macro_command(argc, command)) // continue as usual and scan for normal commands
+       {
+               return; // handled by one of the above GameCommand_* functions
+       }
+       else
+               clientcommand(self, command);
+}
\ No newline at end of file
diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
new file mode 100644 (file)
index 0000000..7d24f2e
--- /dev/null
@@ -0,0 +1,2010 @@
+// =====================================================
+//  Server side game commands code, reworked by Samual
+//  Last updated: December 6th, 2011
+// =====================================================
+
+#define GC_REQUEST_COMMAND 1
+#define GC_REQUEST_USAGE 2
+
+float RadarMap_Make(float argc);
+
+string GotoMap(string m);
+
+void race_deleteTime(string map, float pos);
+
+#define SHUFFLETEAMS_MAX_PLAYERS 255
+#define SHUFFLETEAMS_MAX_TEAMS 4
+float shuffleteams_players[SHUFFLETEAMS_MAX_PLAYERS]; // maximum of 255 player slots
+float shuffleteams_teams[SHUFFLETEAMS_MAX_TEAMS]; // maximum of 4 teams
+
+
+// ============================
+//  Misc. Supporting Functions
+// ============================
+
+//  used by GameCommand_make_mapinfo()
+void make_mapinfo_Think()
+{
+       if(MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 0, 0, 1))
+       {
+               print("Done rebuiling mapinfos.\n");
+               MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0);
+               remove(self);
+       }
+       else
+       {
+               self.think = make_mapinfo_Think;
+               self.nextthink = time;
+       }
+}
+
+//  used by GameCommand_extendmatchtime() and GameCommand_reducematchtime()
+void changematchtime(float delta, float mi, float ma)
+{
+       float cur;
+       float new;
+       float lim;
+
+       if(delta == 0)
+               return;
+       if(autocvar_timelimit < 0)
+               return;
+
+       if(mi <= 10)
+               mi = 10; // at least ten sec in the future
+       cur = time - game_starttime;
+       if(cur > 0)
+               mi += cur; // from current time!
+
+       lim = autocvar_timelimit * 60;
+
+       if(delta > 0)
+       {
+               if(lim == 0)
+                       return; // cannot increase any further
+               else if(lim < ma)
+                       new = min(ma, lim + delta);
+               else // already above maximum: FAIL
+                       return;
+       }
+       else
+       {
+               if(lim == 0) // infinite: try reducing to max, if we are allowed to
+                       new = max(mi, ma);
+               else if(lim > mi) // above minimum: decrease
+                       new = max(mi, lim + delta);
+               else // already below minimum: FAIL
+                       return;
+       }
+
+       cvar_set("timelimit", ftos(new / 60));
+}
+
+//  used by GameCommand_modelbug() // TODO: 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
+// =======================
+
+void GameCommand_adminmsg(float request, float argc) // todo: re-write this, plus support multiple clients at once like moveplayer
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       entity client;
+                       float entno = stof(argv(1)); 
+                       float n, i;
+                       string s;
+                       
+                       if(argc >= 3 && argc <= 4) {
+                               if((entno < 0) | (entno > maxclients)) {
+                                       print("Player ", argv(1), " doesn't exist\n");
+                                       return;
+                               }
+                               n = 0;
+                               for(i = (entno ? entno : 1); i <= (entno ? entno : maxclients); ++i)
+                               {
+                                       client = edict_num(i);
+                                       if(client.flags & FL_CLIENT)
+                                       {
+                                               if(argc == 4)
+                                               {
+                                                       // make the string console safe
+                                                       s = argv(2);
+                                                       s = strreplace("\n", "", s);
+                                                       s = strreplace("\\", "\\\\", s);
+                                                       s = strreplace("$", "$$", s);
+                                                       s = strreplace("\"", "\\\"", s);
+                                                       stuffcmd(client, sprintf("\ninfobar %f \"%s\"\n", stof(argv(3)), s));
+                                               }
+                                               else
+                                               {
+                                                       centerprint(client, strcat("^3", admin_name(), ":\n\n^7", argv(2)));
+                                                       sprint(client, strcat("\{1}\{13}^3", admin_name(), "^7: ", argv(2), "\n"));
+                                               }
+                                               dprint("Message sent to ", client.netname, "\n");
+                                               ++n;
+                                       }
+                               }
+                               if(!n) { print(strcat("Client (", argv(1) ,") not found.\n")); } 
+                               return;
+                       }
+               }
+               
+               default:
+                       print("Incorrect parameters for ^2adminmsg^7\n");
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd adminmsg clientnumber \"message\" [infobartime]\n");
+                       print("  If infobartime is provided, the message will be sent to infobar.\n");
+                       print("  Otherwise, it will just be sent as a centerprint message.\n");
+                       print("Examples: adminmsg 4 \"this infomessage will last for ten seconds\" 10\n");
+                       print("          adminmsg 2 \"this message will be a centerprint\"\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_allready(float request)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       ReadyRestart();
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd allready\n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_allspec(float request, float argc)
+{      
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       entity client;
+                       string reason = argv(1);
+                       float i;
+                       
+                       FOR_EACH_REALPLAYER(client)
+                       {
+                               self = client;
+                               PutObserverInServer();
+                               ++i;
+                       }
+                       if(i) { bprint(strcat("Successfully forced all (", ftos(i), ") players to spectate", (reason ? strcat(" for reason: '", reason, "'") : ""), ".\n")); }
+                       else { print("No players found to spectate.\n"); }
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd allspec [reason]\n");
+                       print("  Where 'reason' is an optional argument for explanation of allspec command.\n");
+                       print("See also: ^2moveplayer, shuffleteams^7\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_anticheat(float request, float argc)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       entity client;
+                       float entno = stof(argv(1)); 
+                       
+                       if((entno < 1) | (entno > maxclients)) {
+                               print("Player ", argv(1), " doesn't exist\n");
+                               return;
+                       }
+                       client = edict_num(entno);
+                       if(clienttype(client) != CLIENTTYPE_REAL || clienttype(client) != CLIENTTYPE_BOT) {
+                               print("Player ", client.netname, " is not active\n");
+                               return;
+                       }
+                       self = client;
+                       anticheat_report();
+                       return;
+               }
+                       
+               default:
+                       print("Incorrect parameters for ^2anticheat^7\n");
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd anticheat clientnumber\n");
+                       print("  where 'clientnumber' is player entity number.\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_bbox(float request)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       print("Original size: ", ftos(world.absmin_x), " ", ftos(world.absmin_y), " ", ftos(world.absmin_z));
+                       print(" ", ftos(world.absmax_x), " ", ftos(world.absmax_y), " ", ftos(world.absmax_z), "\n");
+                       print("Currently set size: ", ftos(world.mins_x), " ", ftos(world.mins_y), " ", ftos(world.mins_z));
+                       print(" ", ftos(world.maxs_x), " ", ftos(world.maxs_y), " ", ftos(world.maxs_z), "\n");
+                       print("Solid bounding box size:");
+
+                       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,
+                                       world);
+                       if(trace_startsolid)
+                               print(" ", ftos(world.absmin_x));
+                       else
+                               print(" ", ftos(trace_endpos_x));
+
+                       tracebox('0 1 0' * world.absmin_y,
+                                                       '1 0 0' * world.absmin_x + '0 0 1' * world.absmin_z,
+                                                       '1 0 0' * world.absmax_x + '0 0 1' * world.absmax_z,
+                                                       '0 1 0' * world.absmax_y,
+                                       MOVE_WORLDONLY,
+                                       world);
+                       if(trace_startsolid)
+                               print(" ", ftos(world.absmin_y));
+                       else
+                               print(" ", ftos(trace_endpos_y));
+
+                       tracebox('0 0 1' * world.absmin_z,
+                                                       '1 0 0' * world.absmin_x + '0 1 0' * world.absmin_y,
+                                                       '1 0 0' * world.absmax_x + '0 1 0' * world.absmax_y,
+                                                       '0 0 1' * world.absmax_z,
+                                       MOVE_WORLDONLY,
+                                       world);
+                       if(trace_startsolid)
+                               print(" ", ftos(world.absmin_z));
+                       else
+                               print(" ", ftos(trace_endpos_z));
+
+                       tracebox('1 0 0' * world.absmax_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.absmin_x,
+                                       MOVE_WORLDONLY,
+                                       world);
+                       if(trace_startsolid)
+                               print(" ", ftos(world.absmax_x));
+                       else
+                               print(" ", ftos(trace_endpos_x));
+
+                       tracebox('0 1 0' * world.absmax_y,
+                                                       '1 0 0' * world.absmin_x + '0 0 1' * world.absmin_z,
+                                                       '1 0 0' * world.absmax_x + '0 0 1' * world.absmax_z,
+                                                       '0 1 0' * world.absmin_y,
+                                       MOVE_WORLDONLY,
+                                       world);
+                       if(trace_startsolid)
+                               print(" ", ftos(world.absmax_y));
+                       else
+                               print(" ", ftos(trace_endpos_y));
+
+                       tracebox('0 0 1' * world.absmax_z,
+                                                       '1 0 0' * world.absmin_x + '0 1 0' * world.absmin_y,
+                                                       '1 0 0' * world.absmax_x + '0 1 0' * world.absmax_y,
+                                                       '0 0 1' * world.absmin_z,
+                                       MOVE_WORLDONLY,
+                                       world);
+                       if(trace_startsolid)
+                               print(" ", ftos(world.absmax_z));
+                       else
+                               print(" ", ftos(trace_endpos_z));
+                               
+                       print("\n");
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd bbox\n");
+                       print("  No arguments required.\n");
+                       print("See also: ^2gettaginfo^7\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_bot_cmd(float request, float argc) // what a mess... old old code.
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       entity bot;
+                       
+                       if(argv(1) == "reset")
+                       {
+                               bot_resetqueues();
+                               return;
+                       }
+                       else if(argv(1) == "load" && argc == 3)
+                       {
+                               float fh, i;
+                               string s;
+                               fh = fopen(argv(2), FILE_READ);
+                               if(fh < 0)
+                               {
+                                       print("cannot open the file\n");
+                                       return;
+                               }
+
+                               i = 0;
+                               while((s = fgets(fh)))
+                               {
+                                       argc = tokenize_console(s);
+
+                                       if(argc >= 3 && argv(0) == "sv_cmd" && argv(1) == "bot_cmd")
+                                       {
+                                               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"));
+
+                                       ++i;
+                               }
+                               print(ftos(i), " commands read\n");
+                               fclose(fh);
+                               return;
+                       }
+                       else if(argv(1) == "help")
+                       {
+                               if(argv(2))
+                                       bot_cmdhelp(argv(2));
+                               else
+                                       bot_list_commands();
+                               return;
+                       }
+                       else if(argc >= 3) // this comes last
+                       {
+                               bot = find_bot_by_number(stof(argv(1)));
+                               if(bot == world)
+                                       bot = find_bot_by_name(argv(1));
+                               if(bot)
+                               {
+                                       print(strcat("Command '", strcat(argv(2), " ", argv(3)), "' sent to bot ", bot.netname, "\n"));
+                                       bot_queuecommand(bot, strcat(argv(2), " ", argv(3)));
+                                       return;
+                               }
+                               else
+                                       print(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
+                       }
+               }
+                       
+               default:
+                       print("Incorrect parameters for ^2bot_cmd^7\n");
+               case GC_REQUEST_USAGE:
+               {
+                       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");
+                       return;
+               }
+       }
+}
+
+void GameCommand_cointoss(float request, float argc)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       entity client;
+                       string result1 = (argv(2) ? strcat("^7", argv(1), "^3!\n") : "^1HEADS^3!\n");
+                       string result2 = (argv(2) ? strcat("^7", argv(2), "^3!\n") : "^4TAILS^3!\n");
+                       string choice = ((random() > 0.5) ? result1 : result2);
+                       
+                       FOR_EACH_CLIENT(client)
+                               centerprint(client, strcat("^3Throwing coin... Result: ", choice));
+                       bprint(strcat("^3Throwing coin... Result: ", choice));
+                       return;
+               }
+               
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd cointoss [result1 result2]\n");
+                       print("  Where 'result1' and 'result2' are user created options.\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_cvar_changes(float request)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       print(cvar_changes);
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd cvar_changes\n");
+                       print("  No arguments required.\n");
+                       print("See also: ^2cvar_purechanges^7\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_cvar_purechanges(float request)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       print(cvar_purechanges);
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd cvar_purechanges\n");
+                       print("  No arguments required.\n");
+                       print("See also: ^2cvar_changes^7\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_database(float request, float argc)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       if(argc == 3)
+                       {
+                               if(argv(1) == "save")
+                               {
+                                       db_save(ServerProgsDB, argv(2));
+                                       print(strcat("Copied serverprogs database to '", argv(2), "' in the data directory.\n"));
+                                       return;
+                               }
+                               else if(argv(1) == "dump")
+                               {
+                                       db_dump(ServerProgsDB, argv(2));
+                                       print("DB dumped.\n"); // wtf does this do?
+                                       return;
+                               }
+                               else if(argv(1) == "load")
+                               {
+                                       db_close(ServerProgsDB);
+                                       ServerProgsDB = db_load(argv(2));
+                                       print(strcat("Loaded '", argv(2), "' as new serverprogs database.\n"));
+                                       return;
+                               }
+                       }
+               }
+                       
+               default:
+                       print("Incorrect parameters for ^2database^7\n");
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd database action filename\n");
+                       print("  Where 'action' is the command to complete,\n");
+                       print("  and 'filename' is what it acts upon.\n");
+                       print("  Full list of commands here: \"save, dump, load.\"\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_defer_clear(float request, float argc)
+{      
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       entity client;
+                       float entno = stof(argv(1));
+                       
+                       if(argc == 2)
+                       {
+                               // player_id is out of range
+                               if((entno < 1) | (entno > maxclients)) {
+                                       print("Player ", argv(1), " doesn't exist\n");
+                                       return;
+                               }
+                               client = edict_num(entno);
+                               if not(client.flags & FL_CLIENT) {
+                                       print("Player ", argv(1), " doesn't exist\n");
+                                       return;
+                               }
+                               if(clienttype(client) == CLIENTTYPE_BOT) {
+                                       print("Player ", argv(1), " (", client.netname, ") is a bot\n");
+                                       return;
+                               }
+                               stuffcmd(client, "defer clear\n");
+                               print("defer clear stuffed to ", argv(1), " (", client.netname, ")\n");
+                               return;
+                       }
+               }
+               
+               default:
+                       print("Incorrect parameters for ^2defer_clear^7\n");
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd defer_clear clientnumber\n");
+                       print("  where 'clientnumber' is player entity number.\n");
+                       print("See also: ^2defer_clear_all^7\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_defer_clear_all(float request)
+{      
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       entity client;
+                       float i;
+                       float argc;
+                       
+                       FOR_EACH_CLIENT(client)
+                       {
+                               argc = tokenize_console(strcat("defer_clear ", ftos(num_for_edict(client))));
+                               GameCommand_defer_clear(GC_REQUEST_COMMAND, argc);      
+                               ++i;
+                       }
+                       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;
+               }
+               
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd defer_clear_all\n");
+                       print("  No arguments required.\n");
+                       print("See also: ^2defer_clear^7\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_delrec(float request, float argc) // UNTESTED // perhaps merge later with records and printstats and such?
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       if(argv(1))
+                       {
+                               if(argv(2))
+                                       race_deleteTime(argv(2), stof(argv(1)));
+                               else
+                                       race_deleteTime(GetMapname(), stof(argv(1)));
+                               return;
+                       }
+               }       
+               
+               default:
+                       print("Incorrect parameters for ^2delrec^7\n");
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd delrec ranking [map]\n");
+                       print("  'ranking' is which ranking level to clear up to, \n");
+                       print("  it will clear all records up to nth place.\n");
+                       print("  if 'map' is not provided it will use current map.\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_effectindexdump(float request)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       float fh, d;
+                       string s;
+                       
+                       d = db_create();
+                       print("begin of effects list\n");
+                       db_put(d, "TE_GUNSHOT", "1"); print("effect TE_GUNSHOT is ", ftos(particleeffectnum("TE_GUNSHOT")), "\n");
+                       db_put(d, "TE_GUNSHOTQUAD", "1"); print("effect TE_GUNSHOTQUAD is ", ftos(particleeffectnum("TE_GUNSHOTQUAD")), "\n");
+                       db_put(d, "TE_SPIKE", "1"); print("effect TE_SPIKE is ", ftos(particleeffectnum("TE_SPIKE")), "\n");
+                       db_put(d, "TE_SPIKEQUAD", "1"); print("effect TE_SPIKEQUAD is ", ftos(particleeffectnum("TE_SPIKEQUAD")), "\n");
+                       db_put(d, "TE_SUPERSPIKE", "1"); print("effect TE_SUPERSPIKE is ", ftos(particleeffectnum("TE_SUPERSPIKE")), "\n");
+                       db_put(d, "TE_SUPERSPIKEQUAD", "1"); print("effect TE_SUPERSPIKEQUAD is ", ftos(particleeffectnum("TE_SUPERSPIKEQUAD")), "\n");
+                       db_put(d, "TE_WIZSPIKE", "1"); print("effect TE_WIZSPIKE is ", ftos(particleeffectnum("TE_WIZSPIKE")), "\n");
+                       db_put(d, "TE_KNIGHTSPIKE", "1"); print("effect TE_KNIGHTSPIKE is ", ftos(particleeffectnum("TE_KNIGHTSPIKE")), "\n");
+                       db_put(d, "TE_EXPLOSION", "1"); print("effect TE_EXPLOSION is ", ftos(particleeffectnum("TE_EXPLOSION")), "\n");
+                       db_put(d, "TE_EXPLOSIONQUAD", "1"); print("effect TE_EXPLOSIONQUAD is ", ftos(particleeffectnum("TE_EXPLOSIONQUAD")), "\n");
+                       db_put(d, "TE_TAREXPLOSION", "1"); print("effect TE_TAREXPLOSION is ", ftos(particleeffectnum("TE_TAREXPLOSION")), "\n");
+                       db_put(d, "TE_TELEPORT", "1"); print("effect TE_TELEPORT is ", ftos(particleeffectnum("TE_TELEPORT")), "\n");
+                       db_put(d, "TE_LAVASPLASH", "1"); print("effect TE_LAVASPLASH is ", ftos(particleeffectnum("TE_LAVASPLASH")), "\n");
+                       db_put(d, "TE_SMALLFLASH", "1"); print("effect TE_SMALLFLASH is ", ftos(particleeffectnum("TE_SMALLFLASH")), "\n");
+                       db_put(d, "TE_FLAMEJET", "1"); print("effect TE_FLAMEJET is ", ftos(particleeffectnum("TE_FLAMEJET")), "\n");
+                       db_put(d, "EF_FLAME", "1"); print("effect EF_FLAME is ", ftos(particleeffectnum("EF_FLAME")), "\n");
+                       db_put(d, "TE_BLOOD", "1"); print("effect TE_BLOOD is ", ftos(particleeffectnum("TE_BLOOD")), "\n");
+                       db_put(d, "TE_SPARK", "1"); print("effect TE_SPARK is ", ftos(particleeffectnum("TE_SPARK")), "\n");
+                       db_put(d, "TE_PLASMABURN", "1"); print("effect TE_PLASMABURN is ", ftos(particleeffectnum("TE_PLASMABURN")), "\n");
+                       db_put(d, "TE_TEI_G3", "1"); print("effect TE_TEI_G3 is ", ftos(particleeffectnum("TE_TEI_G3")), "\n");
+                       db_put(d, "TE_TEI_SMOKE", "1"); print("effect TE_TEI_SMOKE is ", ftos(particleeffectnum("TE_TEI_SMOKE")), "\n");
+                       db_put(d, "TE_TEI_BIGEXPLOSION", "1"); print("effect TE_TEI_BIGEXPLOSION is ", ftos(particleeffectnum("TE_TEI_BIGEXPLOSION")), "\n");
+                       db_put(d, "TE_TEI_PLASMAHIT", "1"); print("effect TE_TEI_PLASMAHIT is ", ftos(particleeffectnum("TE_TEI_PLASMAHIT")), "\n");
+                       db_put(d, "EF_STARDUST", "1"); print("effect EF_STARDUST is ", ftos(particleeffectnum("EF_STARDUST")), "\n");
+                       db_put(d, "TR_ROCKET", "1"); print("effect TR_ROCKET is ", ftos(particleeffectnum("TR_ROCKET")), "\n");
+                       db_put(d, "TR_GRENADE", "1"); print("effect TR_GRENADE is ", ftos(particleeffectnum("TR_GRENADE")), "\n");
+                       db_put(d, "TR_BLOOD", "1"); print("effect TR_BLOOD is ", ftos(particleeffectnum("TR_BLOOD")), "\n");
+                       db_put(d, "TR_WIZSPIKE", "1"); print("effect TR_WIZSPIKE is ", ftos(particleeffectnum("TR_WIZSPIKE")), "\n");
+                       db_put(d, "TR_SLIGHTBLOOD", "1"); print("effect TR_SLIGHTBLOOD is ", ftos(particleeffectnum("TR_SLIGHTBLOOD")), "\n");
+                       db_put(d, "TR_KNIGHTSPIKE", "1"); print("effect TR_KNIGHTSPIKE is ", ftos(particleeffectnum("TR_KNIGHTSPIKE")), "\n");
+                       db_put(d, "TR_VORESPIKE", "1"); print("effect TR_VORESPIKE is ", ftos(particleeffectnum("TR_VORESPIKE")), "\n");
+                       db_put(d, "TR_NEHAHRASMOKE", "1"); print("effect TR_NEHAHRASMOKE is ", ftos(particleeffectnum("TR_NEHAHRASMOKE")), "\n");
+                       db_put(d, "TR_NEXUIZPLASMA", "1"); print("effect TR_NEXUIZPLASMA is ", ftos(particleeffectnum("TR_NEXUIZPLASMA")), "\n");
+                       db_put(d, "TR_GLOWTRAIL", "1"); print("effect TR_GLOWTRAIL is ", ftos(particleeffectnum("TR_GLOWTRAIL")), "\n");
+                       db_put(d, "TR_SEEKER", "1"); print("effect TR_SEEKER is ", ftos(particleeffectnum("TR_SEEKER")), "\n");
+                       db_put(d, "SVC_PARTICLE", "1"); print("effect SVC_PARTICLE is ", ftos(particleeffectnum("SVC_PARTICLE")), "\n");
+
+                       fh = fopen("effectinfo.txt", FILE_READ);
+                       while((s = fgets(fh)))
+                       {
+                               tokenize_console(s);
+                               if(argv(0) == "effect")
+                               {
+                                       if(db_get(d, argv(1)) != "1")
+                                       {
+                                               if(particleeffectnum(argv(1)) >= 0)
+                                                       print("effect ", argv(1), " is ", ftos(particleeffectnum(argv(1))), "\n");
+                                               db_put(d, argv(1), "1");
+                                       }
+                               }
+                       }
+                       print("end of effects list\n");
+
+                       db_close(d);
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd effectindexdump\n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_extendmatchtime(float request)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       changematchtime(autocvar_timelimit_increment* 60, autocvar_timelimit_min*60, autocvar_timelimit_max*60);
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd extendmatchtime\n");
+                       print("  No arguments required.\n");
+                       print("See also: ^2reducematchtime^7\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_find(float request, float argc)
+{      
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       entity client;
+                       
+                       for(client = world; (client = find(client, classname, argv(1))); )
+                               print(etos(client), "\n");
+                               
+                       return;
+               }
+                       
+               default:
+                       print("Incorrect parameters for ^2find^7\n");
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd find classname\n");
+                       print("  Where 'classname' is the classname to search for.\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_gametype(float request, float argc)
+{      
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       string s = argv(1);
+                       float t = MapInfo_Type_FromString(s), tsave = MapInfo_CurrentGametype();
+                       
+                       if(t)
+                       {
+                               MapInfo_SwitchGameType(t);
+                               MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0);
+                               if(MapInfo_count > 0)
+                                       bprint("Game type successfully switched to ", s, "\n");
+                               else
+                               {
+                                       bprint("Cannot use this game type: no map for it found\n");
+                                       MapInfo_SwitchGameType(tsave);
+                                       MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0);
+                               }
+                       }
+                       else
+                               bprint("Game type switch to ", s, " failed: this type does not exist!\n");
+                       return;
+               }
+                       
+               default:
+                       print("Incorrect parameters for ^2gametype^7\n");
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd gametype mode\n");
+                       print("  Where 'mode' is the gametype mode to switch to.\n");
+                       print("See also: ^2gotomap^7\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_gettaginfo(float request, float argc) // UNTESTED // todo: finish usage description for it (but, must first learn this shit)
+{      
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       entity tmp_entity;
+                       float i;
+                       vector v;
+                       
+                       if(argc >= 4)
+                       {
+                               tmp_entity = spawn();
+                               if(argv(1) == "w")
+                                       setmodel(tmp_entity, (nextent(world)).weaponentity.model);
+                               else
+                               {
+                                       precache_model(argv(1));
+                                       setmodel(tmp_entity, argv(1));
+                               }
+                               tmp_entity.frame = stof(argv(2));
+                               if(substring(argv(3), 0, 1) == "#")
+                                       i = stof(substring(argv(3), 1, -1));
+                               else
+                                       i = gettagindex(tmp_entity, argv(3));
+                               if(i)
+                               {
+                                       v = gettaginfo(tmp_entity, i);
+                                       print("model ", tmp_entity.model, " frame ", ftos(tmp_entity.frame), " tag ", gettaginfo_name);
+                                       print(" index ", ftos(i), " parent ", ftos(gettaginfo_parent), "\n");
+                                       print(" vector = ", ftos(v_x), " ", ftos(v_y), " ", ftos(v_z), "\n");
+                                       print(" offset = ", ftos(gettaginfo_offset_x), " ", ftos(gettaginfo_offset_y), " ", ftos(gettaginfo_offset_z), "\n");
+                                       print(" forward = ", ftos(gettaginfo_forward_x), " ", ftos(gettaginfo_forward_y), " ", ftos(gettaginfo_forward_z), "\n");
+                                       print(" right = ", ftos(gettaginfo_right_x), " ", ftos(gettaginfo_right_y), " ", ftos(gettaginfo_right_z), "\n");
+                                       print(" up = ", ftos(gettaginfo_up_x), " ", ftos(gettaginfo_up_y), " ", ftos(gettaginfo_up_z), "\n");
+                                       if(argc >= 6)
+                                       {
+                                               v_y = -v_y;
+                                               localcmd(strcat(argv(4), vtos(v), argv(5), "\n"));
+                                       }
+                               }
+                               else
+                                       print("bone not found\n");
+                                       
+                               remove(tmp_entity);
+                               return;
+                       }
+               }
+                       
+               default:
+                       print("Incorrect parameters for ^2gettaginfo^7\n");
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd gettaginfo\n");
+                       print("  FIXME: Arguments currently unknown\n");
+                       print("See also: ^2bbox^7\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_gotomap(float request, float argc)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       if(argc == 2)
+                       {
+                               print(GotoMap(argv(1)), "\n");
+                               return;
+                       }
+               }
+                       
+               default:
+                       print("Incorrect parameters for ^2gotomap^7\n");
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd gotomap map\n");
+                       print("  Where 'map' is the *.bsp file to change to.\n");
+                       print("See also: ^2gametype^7\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_ladder(float request)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       print(ladder_reply);
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd ladder\n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_lockteams(float request)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       if(teamplay)
+                       {
+                               lockteams = 1;
+                               bprint("^1The teams are now locked.\n");
+                       }
+                       else
+                       {
+                               bprint("lockteams command can only be used in a team-based gamemode.\n");
+                       }
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd lockteams\n");
+                       print("  No arguments required.\n");
+                       print("See also: ^2unlockteams^7\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_make_mapinfo(float request) // UNTESTED
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               { 
+                       entity tmp_entity;
+                       
+                       tmp_entity = spawn();
+                       tmp_entity.classname = "make_mapinfo";
+                       tmp_entity.think = make_mapinfo_Think;
+                       tmp_entity.nextthink = time; // this sucks... todo: re-write this -- Use initializeentity later
+                       MapInfo_Enumerate();
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd make_mapinfo\n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_modelbug(float request) // UNTESTED // is this even needed anymore? 
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       modelbug();
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd modelbug\n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_moveplayer(float request, float argc)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       entity client;
+       
+                       string targets = strreplace(",", " ", argv(1));
+                       string original_targets = strreplace(" ", ", ", targets);
+                       string destination = argv(2);
+                       string notify = argv(3);
+                       
+                       string successful, t;
+                       
+                       // lets see if the target(s) even actually exist.
+                       if((targets) && (destination))
+                       { 
+                               for(;targets;)
+                               {
+                                       t = car(targets); targets = cdr(targets);
+
+                                       // Check to see if the player is a valid target
+                                       if((GetFilteredNumber(t) < 1) || (GetFilteredNumber(t) > maxclients)) // player_id is out of range
+                                       {
+                                               print("Player ", ftos(GetFilteredNumber(t)), " doesn't exist (out of range)", (targets ? ", skipping to next player.\n" : ".\n"));
+                                               continue; 
+                                       }
+                                       client = edict_num(GetFilteredNumber(t));
+                                       if not(client.flags & FL_CLIENT) // player entity is not a client
+                                       {
+                                               print("Player ", ftos(GetFilteredNumber(t)), " doesn't exist (not a client)", (targets ? ", skipping to next player.\n" : ".\n"));
+                                               continue;
+                                       }
+                                       
+                                       // Where are we putting this player?
+                                       if(destination == "spec" || destination == "spectator") 
+                                       {
+                                               if(client.classname != "spectator" && client.classname != "observer")
+                                               {
+                                                       self = client;
+                                                       PutObserverInServer();
+                                                       
+                                                       successful = strcat(successful, (successful ? ", " : ""), client.netname);
+                                               }
+                                               else
+                                               {
+                                                       print("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") is already spectating.\n");
+                                               }
+                                               continue;
+                                       }
+                                       else
+                                       {
+                                               if(client.classname != "spectator" && client.classname != "observer")
+                                               {
+                                                       if(teamplay)
+                                                       {
+                                                               // set up
+                                                               float team_color;
+                                                               float save = client.team_forced;
+                                                               client.team_forced = 0;
+
+                                                               // find the team to move the player to
+                                                               team_color = ColourToNumber(destination);
+                                                               if(team_color == client.team) // already on the destination team
+                                                               {
+                                                                       // keep the forcing undone
+                                                                       print("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") is already on the ", ColoredTeamName(client.team), (targets ? ", skipping to next player.\n" : ".\n"));
+                                                                       continue;
+                                                               } 
+                                                               else if(team_color == 0)  // auto team
+                                                               {
+                                                                       team_color = NumberToTeamNumber(FindSmallestTeam(client, FALSE));
+                                                               }
+                                                               else
+                                                               {
+                                                                       CheckAllowedTeams(client);
+                                                               }
+                                                               client.team_forced = save;
+                                                               
+                                                               // Check to see if the destination team is even available
+                                                               switch(team_color) 
+                                                               {
+                                                                       case COLOR_TEAM1: if(c1 == -1) { print("Sorry, can't move player to red team if it doesn't exist.\n"); return; } break;
+                                                                       case COLOR_TEAM2: if(c2 == -1) { print("Sorry, can't move player to blue team if it doesn't exist.\n"); return; } break;
+                                                                       case COLOR_TEAM3: if(c3 == -1) { print("Sorry, can't move player to yellow team if it doesn't exist.\n"); return; } break;
+                                                                       case COLOR_TEAM4: if(c4 == -1) { print("Sorry, can't move player to pink team if it doesn't exist.\n"); return; } break;
+                                                                       
+                                                                       default: print("Sorry, can't move player here if team ", destination, " doesn't exist.\n"); return;
+                                                               }
+                                                               
+                                                               // If so, lets continue and finally move the player
+                                                               client.team_forced = 0;
+                                                               MoveToTeam(client, team_color, 6, stof(notify));
+                                                               successful = strcat(successful, (successful ? ", " : ""), client.netname);
+                                                               print("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") has been moved to the ", ColoredTeamName(team_color), ".\n");
+                                                               continue;
+                                                       }
+                                                       else
+                                                       {
+                                                               print("Can't change teams when currently not playing a team game.\n");
+                                                               return;
+                                                       }
+                                               }
+                                               else
+                                               {
+                                                       print("Can't change teams if the player isn't in the game.\n"); // well technically we could, but should we allow that? :P 
+                                                       return;
+                                               }
+                                       }
+                               }
+                               
+                               if(successful)
+                                       bprint("Successfully moved players ", successful, " to destination ", destination, ".\n");
+                               else
+                                       print("No players given (", original_targets, ") are able to move.\n");
+                                       
+                               return; // still correct parameters so return to avoid usage print
+                       }
+               }
+                       
+               default:
+                       print("Incorrect parameters for ^2moveplayer^7\n");
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd moveplayer clientnumbers destination [notify]\n");
+                       print("  'clientnumbers' is a list (separated by commas) of player entity ID's\n");
+                       print("  'destination' is what to send the player to, be it team or spectating\n");
+                       print("  Full list of destinations here: \"spec, spectator, red, blue, yellow, pink, auto.\"\n");
+                       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("See also: ^2allspec, shuffleteams^7\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_nospectators(float request)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       blockSpectators = 1;
+                       entity plr;
+                       FOR_EACH_CLIENT(plr) //give every spectator <g_maxplayers_spectator_blocktime> seconds time to become a player
+                       {
+                               if(plr.classname == "spectator" || plr.classname == "observer")
+                               {
+                                       plr.spectatortime = time;
+                                       sprint(plr, strcat("^7You have to become a player within the next ", ftos(autocvar_g_maxplayers_spectator_blocktime), " seconds, otherwise you will be kicked, because spectators aren't allowed at this time!\n"));
+                               }
+                       }
+                       bprint(strcat("^7All spectators will be automatically kicked when not joining the game after ", ftos(autocvar_g_maxplayers_spectator_blocktime), " seconds!\n"));
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd nospectators\n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_onslaught_updatelinks(float request) // UNTESTED // should this be here? Perhaps some mutatorhook call instead....
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       onslaught_updatelinks();
+                       print("ONS links updated\n");
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd onslaught_updatelinks\n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_playerdemo(float request, float argc) // UNTESTED
+{      
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       entity client;
+                       float i, n, entno;
+                       string s;
+                       
+                       switch(argv(1))
+                       {
+                               case "read":
+                               {
+                                       // 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");
+                                               return;
+                                       }
+                                       client = edict_num(entno);
+                                       if(clienttype(client) != CLIENTTYPE_BOT) {
+                                               print("Player ", client.netname, " is not a bot\n");
+                                               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");
+                                               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");
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd \n");
+                       print("  FIXME: Arguments currently unknown\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_printstats(float request)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       DumpStats(FALSE);
+                       print("stats dumped.\n");
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd printstats\n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_radarmap(float request, float argc)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       if(RadarMap_Make(argc))
+                               return;
+               }
+                       
+               default:
+                       print("Incorrect parameters for ^2radarmap^7\n");
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd radarmap [--force] [--loop] [--quit] [--block | --trace | --sample | --lineblock] [--sharpen N] [--res W H] [--qual Q]\n");
+                       print("  The quality factor Q is roughly proportional to the time taken.\n");
+                       print("  trace supports no quality factor; its result should look like --block with infinite quality factor.\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_rankings(float request) // this is OLD.... jeez.
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       strunzone(rankings_reply);
+                       rankings_reply = strzone(getrankings());
+                       print(rankings_reply);
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd rankings\n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_records(float request)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       float i;
+                       
+                       for (i = 0; i < 10; ++i)
+                               print(records_reply[i]);
+                               
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd records\n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_reducematchtime(float request)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       changematchtime(autocvar_timelimit_decrement*-60, autocvar_timelimit_min*60, autocvar_timelimit_max*60);
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd reducematchtime\n");
+                       print("  No arguments required.\n");
+                       print("See also: ^2extendmatchtime^7\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_setbots(float request, float argc)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       if(argc >= 2)
+                       {
+                               cvar_settemp("minplayers", "0");
+                               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");
+                       print("  Where 'botnumber' is the amount of bots to set bot_number cvar to.\n");
+                       print("See also: ^2bot_cmd^7\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_shuffleteams(float request)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       if(teamplay)
+                       {
+                               entity tmp_player;
+                               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)
+                               {
+                                       CheckAllowedTeams(tmp_player);
+                                       
+                                       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
+                               FOR_EACH_PLAYER(tmp_player)
+                               {
+                                       for(;;)
+                                       {
+                                               i = bound(1, floor(random() * maxclients) + 1, maxclients);
+                                               
+                                               if(shuffleteams_players[i])
+                                               {
+                                                       continue; // a player is already assigned to this slot
+                                               }
+                                               else
+                                               {
+                                                       shuffleteams_players[i] = num_for_edict(tmp_player);
+                                                       break;
+                                               }
+                                       }
+                               }
+
+                               // finally, from the list made earlier, re-join the players in different order. 
+                               for(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 = NumberToTeamNumber(i);
+                                       
+                                       // sort through the random list of players made earlier 
+                                       for(z = 1; z <= maxclients; ++z)
+                                       {                                                       
+                                               if not(shuffleteams_teams[i] >= x)
+                                               {
+                                                       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
+                                               }
+                                       }
+                               }
+                               
+                               bprint("Successfully shuffled the players around randomly.\n");
+                               
+                               // clear the buffers now
+                               for (i=0; i<SHUFFLETEAMS_MAX_PLAYERS; ++i)
+                                       shuffleteams_players[i] = 0;
+                               
+                               for (i=0; i<SHUFFLETEAMS_MAX_TEAMS; ++i)
+                                       shuffleteams_teams[i] = 0;
+                       }
+                       else
+                       {
+                               print("Can't shuffle teams when currently not playing a team game.\n");
+                       }
+                       
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd shuffleteams\n");
+                       print("  No arguments required.\n");
+                       print("See also: ^2moveplayer, allspec^7\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_stuffto(float request, float argc)
+{
+       // This... is a fairly dangerous and powerful command... - It allows any arguments to be sent to a client via rcon.
+       // Because of this, it is disabled by default and must be enabled by the server owner when doing compilation. That way,
+       // we can be certain they understand the risks of it... So to enable, compile server with -DSTUFFTO_ENABLED argument.
+       
+       #ifdef STUFFTO_ENABLED
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       entity client;
+                       float entno;
+                       
+                       if(argc == 3)
+                       {
+                               entno = GetFilteredNumber(argv(1));
+                               client = world;
+                               if(entno <= maxclients)
+                                       client = edict_num(entno);
+                               if(client.flags & FL_CLIENT)
+                               {
+                                       stuffcmd(client, strcat("\n", argv(2), "\n"));
+                                       print(strcat("Command: \"", argv(2), "\" sent to ", client.netname, " (", argv(1) ,").\n"));
+                               }
+                               else
+                                       print(strcat("Client (", argv(1) ,") not found.\n"));
+                               
+                               return;
+                       }
+               }
+                       
+               default:
+                       print("Incorrect parameters for ^2stuffto^7\n");
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd stuffto clientnumber command\n");
+                       print("  FIXME: Arguments currently unknown\n");
+                       return;
+               }
+       }
+       #else
+       if(request)
+       {
+               print("stuffto command is not enabled on this server.\n");
+               return;
+       }
+       #endif
+}
+
+void GameCommand_teamstatus(float request)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       Score_NicePrint(world);
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd teamstatus\n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_time(float request)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       print("time = ", ftos(time), "\n");
+                       print("frame start = ", ftos(gettime(GETTIME_FRAMESTART)), "\n");
+                       print("realtime = ", ftos(gettime(GETTIME_REALTIME)), "\n");
+                       print("hires = ", ftos(gettime(GETTIME_HIRES)), "\n");
+                       print("uptime = ", ftos(gettime(GETTIME_UPTIME)), "\n");
+                       print("localtime = ", strftime(TRUE, "%a %b %e %H:%M:%S %Z %Y"), "\n"); // FIXME: Why is strftime broken? is engine problem, I think.
+                       print("gmtime = ", strftime(FALSE, "%a %b %e %H:%M:%S %Z %Y"), "\n");
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd time\n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_trace(float request, float argc)
+{                                              
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       // TODO: Clean up all of these variables and merge the code below to use only a few
+                       entity e;
+                       vector org, delta, start, end, p, q, q0, pos, vv, dv;
+                       float i, f, safe, unsafe, dq, dqf;
+       
+                       switch(argv(1))
+                       {
+                               case "debug":
+                               {
+                                       print("TEST CASE. If this returns the runaway loop counter error, possibly everything is oaky.\n");
+                                       for(;;)
+                                       {
+                                               org = world.mins;
+                                               delta = world.maxs - world.mins;
+
+                                               start_x = org_x + random() * delta_x;
+                                               start_y = org_y + random() * delta_y;
+                                               start_z = org_z + random() * delta_z;
+
+                                               end_x = org_x + random() * delta_x;
+                                               end_y = org_y + random() * delta_y;
+                                               end_z = org_z + random() * delta_z;
+
+                                               start = stov(vtos(start));
+                                               end = stov(vtos(end));
+
+                                               tracebox(start, PL_MIN, PL_MAX, end, MOVE_NOMONSTERS, world);
+                                               if(!trace_startsolid)
+                                               {
+                                                       p = trace_endpos;
+                                                       tracebox(p, PL_MIN, PL_MAX, p, MOVE_NOMONSTERS, world);
+                                                       if(trace_startsolid || trace_fraction == 1)
+                                                       {
+                                                               rint(42); // do an engine breakpoint on VM_rint so you can get the trace that errnoeously returns startsolid
+                                                               tracebox(start, PL_MIN, PL_MAX, end, MOVE_NOMONSTERS, world);
+                                                               tracebox(p, PL_MIN, PL_MAX, q, MOVE_NOMONSTERS, world);
+
+                                                               if(trace_startsolid)
+                                                               {
+                                                                       // how much do we need to back off?
+                                                                       safe = 1;
+                                                                       unsafe = 0;
+                                                                       for(;;)
+                                                                       {
+                                                                               pos = p * (1 - (safe + unsafe) * 0.5) + start * ((safe + unsafe) * 0.5);
+                                                                               tracebox(pos, PL_MIN, PL_MAX, pos, MOVE_NOMONSTERS, world);
+                                                                               if(trace_startsolid)
+                                                                               {
+                                                                                       if((safe + unsafe) * 0.5 == unsafe)
+                                                                                               break;
+                                                                                       unsafe = (safe + unsafe) * 0.5;
+                                                                               }
+                                                                               else
+                                                                               {
+                                                                                       if((safe + unsafe) * 0.5 == safe)
+                                                                                               break;
+                                                                                       safe = (safe + unsafe) * 0.5;
+                                                                               }
+                                                                       }
+
+                                                                       print("safe distance to back off: ", ftos(safe * vlen(p - start)), "qu\n");
+                                                                       print("unsafe distance to back off: ", ftos(unsafe * vlen(p - start)), "qu\n");
+
+                                                                       tracebox(p, PL_MIN + '0.1 0.1 0.1', PL_MAX - '0.1 0.1 0.1', p, MOVE_NOMONSTERS, world);
+                                                                       if(trace_startsolid)
+                                                                               print("trace_endpos much in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n");
+                                                                       else
+                                                                               print("trace_endpos just in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n");
+                                                                       break;
+                                                               }
+
+                                                               q0 = p;
+                                                               dq = 0;
+                                                               dqf = 1;
+                                                               for(;;)
+                                                               {
+                                                                       q = p + normalize(end - p) * (dq + dqf);
+                                                                       if(q == q0)
+                                                                               break;
+                                                                       tracebox(p, PL_MIN, PL_MAX, q, MOVE_NOMONSTERS, world);
+                                                                       if(trace_startsolid)
+                                                                               error("THIS ONE cannot happen");
+                                                                       if(trace_fraction > 0)
+                                                                               dq += dqf * trace_fraction;
+                                                                       dqf *= 0.5;
+                                                                       q0 = q;
+                                                               }
+                                                               if(dq > 0)
+                                                               {
+                                                                       print("trace_endpos still before solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n");
+                                                                       print("could go ", ftos(dq), " units further to ", vtos(q), "\n");
+                                                                       break;
+                                                               }
+                                                       }
+                                               }
+                                       }
+                                       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;
+                                       if(trace_fraction == 1)
+                                       {
+                                               print("not above ground, aborting\n");
+                                               return;
+                                       }
+                                       f = 0;
+                                       for(i = 0; i < 100000; ++i)
+                                       {
+                                               dv = randomvec();
+                                               if(dv_z > 0)
+                                                       dv = -1 * dv;
+                                               tracebox(vv, e.mins, e.maxs, vv + dv, MOVE_NORMAL, e);
+                                               if(trace_startsolid)
+                                                       print("bug 1\n");
+                                               if(trace_fraction == 1)
+                                               if(dv_z < f)
+                                               {
+                                                       print("bug 2: ", ftos(dv_x), " ", ftos(dv_y), " ", ftos(dv_z));
+                                                       print(" (", ftos(asin(dv_z / vlen(dv)) * 180 / M_PI), " degrees)\n");
+                                                       f = dv_z;
+                                               }
+                                       }
+                                       print("highest possible dist: ", ftos(f), "\n");
+                                       return;
+                               }
+                               
+                               case "walk":
+                               {
+                                       if(argc == 3)
+                                       {
+                                               e = nextent(world);
+                                               if(tracewalk(e, stov(argv(1)), e.mins, e.maxs, stov(argv(2)), MOVE_NORMAL))
+                                                       print("can walk\n");
+                                               else
+                                                       print("cannot walk\n");
+                                               return;
+                                       }
+                               }
+                               
+                               case "showline":
+                               {
+                                       if(argc == 3)
+                                       {
+                                               vv = stov(argv(1));
+                                               dv = stov(argv(2));
+                                               traceline(vv, dv, MOVE_NORMAL, world);
+                                               trailparticles(world, particleeffectnum("TR_NEXUIZPLASMA"), vv, trace_endpos);
+                                               trailparticles(world, particleeffectnum("TR_CRYLINKPLASMA"), trace_endpos, dv);
+                                               return;
+                                       }
+                               }
+                               
+                               // 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");
+                       print("  FIXME: Arguments currently unknown\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_unlockteams(float request)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       if(teamplay)
+                       {
+                               lockteams = 0;
+                               bprint("^1The teams are now unlocked.\n");
+                       }
+                       else
+                       {
+                               bprint("unlockteams command can only be used in a team-based gamemode.\n");
+                       }
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd unlockteams\n");
+                       print("  No arguments required.\n");
+                       print("See also: ^2lockteams^7\n");
+                       return;
+               }
+       }
+}
+
+void GameCommand_warp(float request, float argc)
+{
+       switch (request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       if(autocvar_g_campaign)
+                       {
+                               if(argc >= 2)
+                               {
+                                       CampaignLevelWarp(stof(argv(1)));
+                                       print("Successfully warped to campaign level ", stof(argv(1)), ".\n");
+                               }       
+                               else
+                               {
+                                       CampaignLevelWarp(-1);
+                                       print("Successfully warped to next campaign level.\n");
+                               }
+                       }
+                       else
+                               print("Not in campaign, can't level warp\n");
+                       return;
+               }
+               
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd level\n");
+                       print("  'level' is the level to change campaign mode to.\n");
+                       return;
+               }
+       }
+}
+
+/* use this when creating a new command, making sure to place it in alphabetical order.
+void GameCommand_(float request)
+{
+       switch(request)
+       {
+               case GC_REQUEST_COMMAND:
+               {
+                       
+                       return;
+               }
+                       
+               default:
+               case GC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd \n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+*/
+
+
+// ==================================
+//  Macro system for server commands
+// ==================================
+
+// Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
+#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("anticheat", GameCommand_anticheat(request, arguments), "Create an anticheat report for a client") \
+       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", GameCommand_cvar_changes(request), "Prints a list of all changed server cvars") \
+       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("defer_clear_all", GameCommand_defer_clear_all(request), "Clear all queued defer commands for all clients") \
+       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") \
+       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("gotomap", GameCommand_gotomap(request, arguments), "Simple command to switch to another map") \
+       SERVER_COMMAND("ladder", GameCommand_ladder(request), "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("make_mapinfo", GameCommand_make_mapinfo(request), "Automatically rebuild mapinfo files") \
+       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("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") \
+       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", GameCommand_teamstatus(request), "Show information about player and team scores") \
+       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") \
+       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(0, 0, "")
+       #undef SERVER_COMMAND
+       
+       return;
+}
+
+float GameCommand_macro_command(float argc, string command)
+{
+       #define SERVER_COMMAND(name,function,description) \
+               { if(name == strtolower(argv(0))) { function; return TRUE; } }
+               
+       SERVER_COMMANDS(GC_REQUEST_COMMAND, argc, command)
+       #undef SERVER_COMMAND
+       
+       return FALSE;
+}
+
+float GameCommand_macro_usage(float argc)
+{
+       #define SERVER_COMMAND(name,function,description) \
+               { if(name == strtolower(argv(1))) { function; return TRUE; } }
+               
+       SERVER_COMMANDS(GC_REQUEST_USAGE, argc, "")
+       #undef SERVER_COMMAND
+       
+       return FALSE;
+}
+       
+
+// =========================================
+//  Main Function Called By Engine (sv_cmd)
+// =========================================
+// If this function exists, game code handles gamecommand instead of the engine code.
+
+void GameCommand(string command)
+{
+       float argc = tokenize_console(command);
+
+       if(strtolower(argv(0)) == "help") 
+       {
+               if(argc == 1) 
+               {
+                       print("\nUsage:^3 sv_cmd COMMAND...^7, where possible commands are:\n");
+                       GameCommand_macro_help();
+                       
+                       GameCommand_Ban("help");
+                       GameCommand_Generic("help");
+                       print("For help about specific commands, 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
+               {
+                       return;
+               }
+       } 
+       else if(GameCommand_Ban(command)) 
+       {
+               return; // handled by server/ipban.qc
+       }
+       else if(GameCommand_Generic(command)) 
+       {
+               return; // handled by common/gamecommand.qc
+       }
+       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("Unknown server command", ((command != "") ? strcat(" \"", command, "\"") : ""), ". For a list of supported commands, try sv_cmd help.\n");
+       
+       return;
+}
\ No newline at end of file
diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
new file mode 100644 (file)
index 0000000..2ed9f4f
--- /dev/null
@@ -0,0 +1,1056 @@
+// =============================================
+//  Server side voting code, reworked by Samual
+//  Last updated: December 10th, 2011
+// =============================================
+
+#define VC_REQUEST_COMMAND 1
+#define VC_REQUEST_USAGE 2
+
+#define VC_ASGNMNT_BOTH 1
+#define VC_ASGNMNT_CLIENTONLY 2
+#define VC_ASGNMNT_SERVERONLY 3
+
+#define VOTE_SELECT_ABSTAIN -2
+#define VOTE_SELECT_REJECT -1
+#define VOTE_SELECT_NULL 0
+#define VOTE_SELECT_ACCEPT 1
+
+string vote_parsed_command;
+string vote_parsed_display;
+
+
+// =============================================
+//  Nagger for players to know status of voting
+// =============================================
+
+float Nagger_SendEntity(entity to, float sendflags)
+{
+       float nags, i, f, b;
+       entity e;
+       WriteByte(MSG_ENTITY, ENT_CLIENT_NAGGER);
+
+       // bits:
+       //   1 = ready
+       //   2 = player needs to ready up
+       //   4 = vote
+       //   8 = player needs to vote
+       //  16 = warmup
+       // sendflags:
+       //  64 = vote counts
+       // 128 = vote string
+
+       nags = 0;
+       if(readycount)
+       {
+               nags |= 1;
+               if(to.ready == 0)
+                       nags |= 2;
+       }
+       if(votecalled)
+       {
+               nags |= 4;
+               if(to.vote_selection == 0)
+                       nags |= 8;
+       }
+       if(inWarmupStage)
+               nags |= 16;
+
+       if(sendflags & 64)
+               nags |= 64;
+
+       if(sendflags & 128)
+               nags |= 128;
+
+       if(!(nags & 4)) // no vote called? send no string
+               nags &~= (64 | 128);
+
+       WriteByte(MSG_ENTITY, nags);
+
+       if(nags & 64)
+       {
+               WriteByte(MSG_ENTITY, vote_accept_count);
+               WriteByte(MSG_ENTITY, vote_reject_count);
+               WriteByte(MSG_ENTITY, vote_needed_overall);
+               WriteChar(MSG_ENTITY, to.vote_selection);
+       }
+
+       if(nags & 128)
+               WriteString(MSG_ENTITY, votecalledvote_display);
+
+       if(nags & 1)
+       {
+               for(i = 1; i <= maxclients; i += 8)
+               {
+                       for(f = 0, e = edict_num(i), b = 1; b < 256; b *= 2, e = nextent(e))
+                               if(clienttype(e) != CLIENTTYPE_REAL || e.ready)
+                                       f |= b;
+                       WriteByte(MSG_ENTITY, f);
+               }
+       }
+
+       return TRUE;
+}
+
+void Nagger_Init()
+{
+       Net_LinkEntity(nagger = spawn(), FALSE, 0, Nagger_SendEntity);
+}
+
+void Nagger_VoteChanged()
+{
+       if(nagger)
+               nagger.SendFlags |= 128;
+}
+
+void Nagger_VoteCountChanged()
+{
+       if(nagger)
+               nagger.SendFlags |= 64;
+}
+
+void Nagger_ReadyCounted()
+{
+       if(nagger)
+               nagger.SendFlags |= 1;
+}
+
+
+// =======================
+//  Game logic for voting
+// =======================
+
+void VoteReset() 
+{
+       entity tmp_player;
+
+       FOR_EACH_CLIENT(tmp_player) { tmp_player.vote_selection = 0; }
+
+       if(votecalled)
+       {
+               strunzone(votecalledvote);
+               strunzone(votecalledvote_display);
+       }
+
+       votecalled = FALSE;
+       votecalledmaster = FALSE;
+       votefinished = 0;
+       votecalledvote = string_null;
+       votecalledvote_display = string_null;
+       
+       vote_parsed_command = string_null;
+       vote_parsed_display = string_null;
+
+       Nagger_VoteChanged();
+}
+
+void VoteStop(entity stopper) 
+{
+       bprint("\{1}^2* ^3", VoteCommand_getname(stopper), "^2 stopped ^3", VoteCommand_getname(votecaller), "^2's vote\n");
+       if(autocvar_sv_eventlog) { GameLogEcho(strcat(":vote:vstop:", ftos(stopper.playerid))); }
+       
+       // Don't force them to wait for next vote, this way they can e.g. correct their vote.
+       if((votecaller) && (stopper == votecaller)) { votecaller.vote_next = time + autocvar_sv_vote_stop; }
+
+       VoteReset();
+}
+
+void VoteThink() 
+{
+       if(votefinished > 0) // a vote was called
+       if(time > votefinished) // time is up
+       {
+               VoteCount();
+       }
+       
+       return;
+}
+
+void VoteAccept() 
+{
+       bprint("\{1}^2* ^3", VoteCommand_getname(votecaller), "^2's vote for ^1", votecalledvote_display, "^2 was accepted\n");
+       
+       if(votecalledmaster && votecaller)
+               votecaller.vote_master = 1;
+       else
+               localcmd(strcat(votecalledvote, "\n"));
+       
+       if(votecaller) { votecaller.vote_next = 0; } // people like your votes, you don't need to wait to vote again // todo separate anti-spam even for succeeded votes
+
+       VoteReset();
+       Announce("voteaccept");
+}
+
+void VoteReject() 
+{
+       bprint("\{1}^2* ^3", VoteCommand_getname(votecaller), "^2's vote for ", votecalledvote_display, "^2 was rejected\n");
+       VoteReset();
+       Announce("votefail");
+}
+
+void VoteTimeout() 
+{
+       bprint("\{1}^2* ^3", VoteCommand_getname(votecaller), "^2's vote for ", votecalledvote_display, "^2 timed out\n");
+       VoteReset();
+       Announce("votefail");
+}
+
+void VoteSpam(float notvoters, float mincount, string result)
+{
+       string s;
+       if(mincount >= 0)
+       {
+               s = strcat("\{1}^2* vote results: ^1", ftos(vote_accept_count), "^2:^1");
+               s = strcat(s, ftos(vote_reject_count), "^2 (^1");
+               s = strcat(s, ftos(mincount), "^2 needed), ^1");
+               s = strcat(s, ftos(vote_abstain_count), "^2 didn't care, ^1");
+               s = strcat(s, ftos(notvoters), "^2 didn't vote\n");
+       }
+       else
+       {
+               s = strcat("\{1}^2* vote results: ^1", ftos(vote_accept_count), "^2:^1");
+               s = strcat(s, ftos(vote_reject_count), "^2, ^1");
+               s = strcat(s, ftos(vote_abstain_count), "^2 didn't care, ^1");
+               s = strcat(s, ftos(notvoters), "^2 didn't have to vote\n");
+       }
+       
+       bprint(s);
+       
+       if(autocvar_sv_eventlog)
+       {
+               s = strcat(":vote:v", result, ":", ftos(vote_accept_count));
+               s = strcat(s, ":", ftos(vote_reject_count));
+               s = strcat(s, ":", ftos(vote_abstain_count));
+               s = strcat(s, ":", ftos(notvoters));
+               s = strcat(s, ":", ftos(mincount));
+               GameLogEcho(s);
+       }
+}
+
+void VoteCount() 
+{
+       // declarations
+       vote_accept_count = vote_reject_count = vote_abstain_count = 0;
+       
+       float spectators_allowed = ((autocvar_sv_vote_nospectators != 2) 
+                               || ((autocvar_sv_vote_nospectators == 1) && inWarmupStage) 
+                               || (autocvar_sv_vote_nospectators == 0));
+                               
+       float vote_player_count, is_player, notvoters;
+       float vote_real_player_count, vote_real_accept_count;
+       float vote_real_reject_count, vote_real_abstain_count;
+       float vote_needed_of_voted, final_needed_votes;
+       float vote_factor_overall, vote_factor_of_voted;
+       
+       entity tmp_player;
+
+       Nagger_VoteCountChanged();
+       
+       // add up all the votes from each connected client
+       FOR_EACH_REALCLIENT(tmp_player)
+       {
+               is_player = (tmp_player.classname == "player");
+               
+               ++vote_player_count;
+               if(is_player) { ++vote_real_player_count; }
+               
+               switch(tmp_player.vote_selection)
+               {
+                       case VOTE_SELECT_REJECT: { ++vote_reject_count; { if(is_player) ++vote_real_reject_count; } break; }
+                       case VOTE_SELECT_ACCEPT: { ++vote_accept_count; { if(is_player) ++vote_real_reject_count; } break; }
+                       case VOTE_SELECT_ABSTAIN: { ++vote_abstain_count; { if(is_player) ++vote_real_abstain_count; } break; }
+                       default: break;
+               }
+       }
+       
+       // Check to see if there are enough players on the server to allow master voting... otherwise, vote master could be used for evil.
+       if(votecalledmaster && autocvar_sv_vote_master_playerlimit > vote_player_count) 
+       {
+               if(votecaller) { votecaller.vote_next = 0; }
+               print_to(votecaller, "^1There are not enough players on this server to allow you to become vote master.");
+               VoteReset();
+               return;
+       }
+       
+       // if spectators aren't allowed to vote and there are players in a match, then only count the players in the vote and ignore spectators. 
+       if(!spectators_allowed && (vote_real_player_count > 0))
+       {
+               vote_accept_count = vote_real_accept_count;
+               vote_reject_count = vote_real_reject_count;
+               vote_abstain_count = vote_real_abstain_count;
+               vote_player_count = vote_real_player_count;
+       }
+       
+       // people who have no opinion in any way :D
+       notvoters = (vote_player_count - vote_accept_count - vote_reject_count - vote_abstain_count);
+
+       // determine the goal for the vote to be passed or rejected normally
+       vote_factor_overall = bound(0.5, autocvar_sv_vote_majority_factor, 0.999);
+       vote_needed_overall = floor((vote_player_count - vote_abstain_count) * vote_factor_overall) + 1;
+       
+       // if the vote times out, determine the amount of votes needed of the people who actually already voted
+       vote_factor_of_voted = bound(0.5, autocvar_sv_vote_majority_factor_of_voted, 0.999);
+       vote_needed_of_voted = floor((vote_accept_count + vote_reject_count) * vote_factor_of_voted) + 1;
+       
+       
+       // finally calculate the result of the vote     
+       if(vote_accept_count >= vote_needed_overall)
+       {
+               VoteSpam(notvoters, -1, "yes"); // there is enough acceptions to pass the vote
+               VoteAccept();
+               return;
+       }
+       
+       if(vote_reject_count > vote_player_count - vote_abstain_count - vote_needed_overall)
+       {
+               VoteSpam(notvoters, -1, "no"); // there is enough rejections to deny the vote
+               VoteReject();
+               return;
+       }
+       
+       // there is not enough votes in either direction, now lets just calculate what the voters have said
+       if(time > votefinished)
+       {
+               final_needed_votes = vote_needed_overall;
+               
+               if(autocvar_sv_vote_majority_factor_of_voted)
+               {
+                       if(vote_accept_count >= vote_needed_of_voted)
+                       {
+                               VoteSpam(notvoters, min(vote_needed_overall, vote_needed_of_voted), "yes");
+                               VoteAccept();
+                               return;
+                       }
+                       
+                       if(vote_accept_count + vote_reject_count > 0)
+                       {
+                               VoteSpam(notvoters, min(vote_needed_overall, vote_needed_of_voted), "no");
+                               VoteReject();
+                               return;
+                       }
+                       
+                       final_needed_votes = min(vote_needed_overall, vote_needed_of_voted);
+               }
+
+               // it didn't pass or fail, so not enough votes to even make a decision. 
+               VoteSpam(notvoters, final_needed_votes, "timeout");
+               VoteTimeout();
+       }
+}
+
+
+// =======================
+//  Game logic for warmup
+// =======================
+
+// Restarts the map after the countdown is over (and cvar sv_ready_restart_after_countdown is set)
+void ReadyRestart_think() 
+{
+       restart_mapalreadyrestarted = 1;
+       reset_map(TRUE);
+       Score_ClearAll();
+       remove(self);
+       
+       return;
+}
+
+// Forces a restart of the game without actually reloading the map // this is a mess...
+void ReadyRestart_force()
+{
+       entity tmp_player, restart_timer;
+
+       bprint("^1Server is restarting...\n");
+
+       VoteReset();
+
+       // clear overtime, we have to decrease timelimit to its original value again.
+       if (checkrules_overtimesadded > 0 && g_race_qualifying != 2) { cvar_set("timelimit", ftos(autocvar_timelimit - (checkrules_overtimesadded * autocvar_timelimit_overtime))); }
+
+       checkrules_suddendeathend = checkrules_overtimesadded = checkrules_suddendeathwarning = 0;
+
+       readyrestart_happened = 1;
+       game_starttime = time;
+       if(!g_ca && !g_arena) { game_starttime += RESTART_COUNTDOWN; }
+               
+       restart_mapalreadyrestarted = 0; // reset this var, needed when cvar sv_ready_restart_repeatable is in use
+
+       // disable the warmup global for the server
+       inWarmupStage = 0; // once the game is restarted the game is in match stage
+
+       // reset the .ready status of all players (also spectators)
+       FOR_EACH_CLIENTSLOT(tmp_player) { tmp_player.ready = 0; }
+       readycount = 0;
+       Nagger_ReadyCounted(); // NOTE: this causes a resend of that entity, and will also turn off warmup state on the client
+
+       // lock teams with lockonrestart
+       if(autocvar_teamplay_lockonrestart && teamplay) 
+       {
+               lockteams = 1;
+               bprint("^1The teams are now locked.\n");
+       }
+
+       //initiate the restart-countdown-announcer entity
+       if(autocvar_sv_ready_restart_after_countdown && !g_ca && !g_arena)
+       {
+               restart_timer = spawn();
+               restart_timer.think = ReadyRestart_think;
+               restart_timer.nextthink = game_starttime;
+       }
+
+       // after a restart every players number of allowed timeouts gets reset, too
+       if(autocvar_sv_timeout) { FOR_EACH_REALPLAYER(tmp_player) { tmp_player.allowedTimeouts = autocvar_sv_timeout_number; } }
+
+       //reset map immediately if this cvar is not set
+       if not(autocvar_sv_ready_restart_after_countdown) { reset_map(TRUE); }
+
+       if(autocvar_sv_eventlog) { GameLogEcho(":restart"); }
+}
+
+void ReadyRestart()
+{
+       // no arena, assault support yet...
+       if(g_arena | g_assault | gameover | intermission_running | race_completing)
+               localcmd("restart\n");
+       else
+               localcmd("\nsv_hook_gamerestart\n");
+
+       // Reset ALL scores, but only do that at the beginning of the countdown if sv_ready_restart_after_countdown is off!
+       // Otherwise scores could be manipulated during the countdown.
+       if not(autocvar_sv_ready_restart_after_countdown) { Score_ClearAll(); }
+
+       ReadyRestart_force();
+       
+       return;
+}
+
+// Count the players who are ready and determine whether or not to restart the match // todo: add percentage ready support
+void ReadyCount()
+{
+       entity tmp_player;
+       float ready_needed_factor, ready_needed_count;
+       float t_ready, t_players;
+
+       FOR_EACH_REALPLAYER(tmp_player)
+       {
+               ++t_players;
+               if(tmp_player.ready) { ++t_ready; }
+       }
+
+       readycount = t_ready;
+
+       Nagger_ReadyCounted();
+
+       ready_needed_factor = bound(0.5, cvar("g_warmup_majority_factor"), 0.999);
+       ready_needed_count = floor(t_players * ready_needed_factor) + 1;
+       
+       if(readycount >= ready_needed_count)
+       {
+               ReadyRestart();
+       }
+               
+       return;
+}
+
+
+// ======================================
+//  Supporting functions for VoteCommand
+// ======================================
+
+float Votecommand_check_assignment(entity caller, float assignment)
+{
+       float from_server = (!caller);
+       
+       if((assignment == VC_ASGNMNT_BOTH) 
+               || ((!from_server && assignment == VC_ASGNMNT_CLIENTONLY) 
+               || (from_server && assignment == VC_ASGNMNT_SERVERONLY)))
+       {
+               return TRUE;
+       }
+
+       return FALSE;
+}
+
+string VoteCommand_getprefix(entity caller)
+{
+       if(caller)
+               return "cmd";
+       else
+               return "sv_cmd";
+}
+
+string VoteCommand_getname(entity caller)
+{
+       if(caller)
+               return caller.netname;
+       else
+               return ((autocvar_sv_adminnick != "") ? autocvar_sv_adminnick : autocvar_hostname);
+}
+
+string VoteCommand_extractcommand(string input, float startpos, float argc) 
+{
+       string output;
+       
+       if((argc - 1) < startpos)
+               output = "";
+       else
+               output = substring(input, argv_start_index(startpos), argv_end_index(-1) - argv_start_index(startpos));
+               
+       print("VoteCommand_parse: '", output, "'. \n");
+       return output;
+}
+
+float VoteCommand_checknasty(string vote_command)
+{
+       if((strstrofs(vote_command, ";", 0) >= 0)
+               || (strstrofs(vote_command, "\n", 0) >= 0)
+               || (strstrofs(vote_command, "\r", 0) >= 0)
+               || (strstrofs(vote_command, "$", 0) >= 0))
+               return FALSE;
+               
+       return TRUE;
+}
+
+float VoteCommand_checkinlist(string vote_command, string list)
+{
+       string l = strcat(" ", list, " ");
+       
+       if(strstrofs(l, strcat(" ", vote_command, " "), 0) >= 0)
+               return TRUE;
+       
+       // if gotomap is allowed, chmap is too, and vice versa
+       if(vote_command == "gotomap")
+               if(strstrofs(l, " chmap ", 0) >= 0)
+                       return TRUE;
+                       
+       if(vote_command == "chmap")
+               if(strstrofs(l, " gotomap ", 0) >= 0)
+                       return TRUE;
+       
+       return FALSE;
+}
+
+string ValidateMap(string validated_map, entity caller)
+{
+       validated_map = MapInfo_FixName(validated_map);
+       
+       if(!validated_map)
+       {
+               print_to(caller, "This map is not available on this server.");
+               return string_null;
+       }
+       
+       if(!autocvar_sv_vote_override_mostrecent && caller)
+       {
+               if(Map_IsRecent(validated_map))
+               {
+                       print_to(caller, "This server does not allow for recent maps to be played again. Please be patient for some rounds.");
+                       return string_null;
+               }
+       }
+       
+       if(!MapInfo_CheckMap(validated_map))
+       {
+               print_to(caller, strcat("^1Invalid mapname, \"^3", validated_map, "^1\" does not support the current game mode."));
+               return string_null;
+       }
+
+       return validated_map;
+}
+
+float VoteCommand_parse(entity caller, string vote_command, string vote_list, float startpos, float argc)
+{
+       string first_command;
+       entity victim;
+       
+       first_command = argv(startpos);
+
+       if not(VoteCommand_checkinlist(vote_command, vote_list))
+               return FALSE;
+
+       if((argc - 1) < startpos) // These commands won't work without arguments
+       {
+               switch(first_command)
+               {
+                       case "map":
+                       case "chmap":
+                       case "gotomap":
+                       case "kick":
+                       case "kickban":
+                               return FALSE;
+                               
+                       default: { break; }
+               }
+       }
+       
+       switch(first_command) // now go through and parse the proper commands to adjust as needed.
+       {
+               case "kick":
+               case "kickban": // catch all kick/kickban commands
+               {
+                       victim = edict_num(GetFilteredNumber(substring(vote_command, argv_start_index(startpos + 1), argv_end_index(-1) - argv_start_index(startpos + 1))));
+                       if not(victim) { return FALSE; }
+                       // TODO: figure out how kick/kickban/ban commands work and re-write this to fit around them
+                       vote_parsed_command = vote_command;
+                       vote_parsed_display = strcat("^1", vote_command, " (^7", victim.netname, "^1): ", "todo");
+                       
+                       break;
+               }
+               
+               case "map":
+               case "chmap":
+               case "gotomap": // re-direct all map selection commands to gotomap
+               {
+                       vote_command = ValidateMap(substring(vote_command, argv_start_index(startpos + 1), argv_end_index(-1) - argv_start_index(startpos + 1)), caller);
+                       if not(vote_command) { return FALSE; }
+                       vote_parsed_command = strcat("gotomap ", vote_command);
+                       vote_parsed_display = strzone(strcat("^1", vote_parsed_command));
+                       
+                       break;
+               }
+               
+               default: 
+               { 
+                       vote_parsed_command = vote_command;
+                       vote_parsed_display = strzone(strcat("^1", vote_command));
+                       
+                       break; 
+               }
+       }
+
+       return TRUE;
+}
+
+
+// =======================
+//  Command Sub-Functions
+// =======================
+
+void VoteCommand_abstain(float request, entity caller) // CLIENT ONLY
+{
+       switch(request)
+       {
+               case VC_REQUEST_COMMAND:
+               {
+                       if not(votecalled) { print_to(caller, "^1No vote called."); }
+                       else if not(caller.vote_selection == VOTE_SELECT_NULL || autocvar_sv_vote_change) { print_to(caller, "^1You have already voted."); }
+                       
+                       else // everything went okay, continue changing vote
+                       {
+                               print_to(caller, "^1You abstained from your vote.");
+                               caller.vote_selection = VOTE_SELECT_ABSTAIN;
+                               msg_entity = caller;
+                               if(!autocvar_sv_vote_singlecount) { VoteCount(); }
+                       }
+                       
+                       return;
+               }
+                       
+               default:
+               case VC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 vote abstain\n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void VoteCommand_call(float request, entity caller, float argc, string vote_command) // BOTH
+{
+       switch(request)
+       {
+               case VC_REQUEST_COMMAND:
+               {
+                       float spectators_allowed = ((autocvar_sv_vote_nospectators != 2) 
+                               || ((autocvar_sv_vote_nospectators == 1) && inWarmupStage) 
+                               || (autocvar_sv_vote_nospectators == 0));
+                               
+                       float tmp_playercount;
+                       entity tmp_player;
+                       
+                       vote_command = VoteCommand_extractcommand(vote_command, 2, argc);
+                       
+                       if not(autocvar_sv_vote_call || !caller) { print_to(caller, "^1Vote calling is not allowed."); }
+                       else if(votecalled) { print_to(caller, "^1There is already a vote called."); }
+                       else if(!spectators_allowed && (caller && (caller.classname != "player"))) { print_to(caller, "^1Only players can call a vote."); }
+                       else if(timeoutStatus) { print_to(caller, "^1You can not call a vote while a timeout is active."); }
+                       else if(caller && (time < caller.vote_next)) { print_to(caller, strcat("^1You have to wait ^2", ftos(ceil(caller.vote_next - time)), "^1 seconds before you can again call a vote.")); }
+                       else if not(VoteCommand_checknasty(vote_command)) { print_to(caller, "^1Syntax error in command, see 'vhelp' for more info."); }
+                       else if not(VoteCommand_parse(caller, vote_command, autocvar_sv_vote_commands, 2, argc)) { print_to(caller, "^1This command is not acceptable, see 'vhelp' for more info."); }
+
+                       else // everything went okay, continue with calling the vote // TODO: fixes to make this more compatible with sv_cmd
+                       {
+                               votecalled = TRUE;
+                               votecalledmaster = FALSE;
+                               votecalledvote = strzone(vote_parsed_command);
+                               votecalledvote_display = strzone(vote_parsed_display);
+                               votefinished = time + autocvar_sv_vote_timeout;
+                               votecaller = caller; // remember who called the vote
+                               
+                               if(caller)
+                               {
+                                       caller.vote_selection = VOTE_SELECT_ACCEPT;
+                                       caller.vote_next = time + autocvar_sv_vote_wait;
+                                       msg_entity = caller; // todo: what is this for?
+                               }
+                               
+                               FOR_EACH_REALCLIENT(tmp_player) { ++tmp_playercount; }
+                               if(tmp_playercount > 1) { Announce("votecall"); } // don't announce a "vote now" sound if player is alone
+                               
+                               bprint("\{1}^2* ^3", VoteCommand_getname(votecaller), "^2 calls a vote for ", votecalledvote_display, "\n");
+                               if(autocvar_sv_eventlog) { GameLogEcho(strcat(":vote:vcall:", ftos(votecaller.playerid), ":", votecalledvote_display)); }
+                               Nagger_VoteChanged();
+                               VoteCount(); // needed if you are the only one
+                       }
+                       
+                       return;
+               }
+                       
+               default:
+               case VC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 vote call\n");
+                       print("  TODO.\n");
+                       return;
+               }
+       }
+}
+
+void VoteCommand_master(float request, entity caller, float argc, string vote_command) // CLIENT ONLY
+{
+       switch(request)
+       {
+               case VC_REQUEST_COMMAND:
+               {
+                       if(autocvar_sv_vote_master)
+                       {
+                               switch(strtolower(argv(2)))
+                               {
+                                       case "do":
+                                       {
+                                               vote_command = VoteCommand_extractcommand(vote_command, 3, argc);
+                                               
+                                               if not(caller.vote_master) { print_to(caller, "^1You do not have vote master privelages."); }
+                                               else if not(VoteCommand_checknasty(vote_command)) { print_to(caller, "^1Syntax error in command, see 'vhelp' for more info."); }
+                                               else if not(VoteCommand_parse(caller, vote_command, autocvar_sv_vote_master_commands, 3, argc)) { print_to(caller, "^1This command is not acceptable, see 'vhelp' for more info."); }
+                                               
+                                               else // everything went okay, proceed with command
+                                               {
+                                                       localcmd(strcat(vote_parsed_command, "\n"));
+                                                       print_to(caller, strcat("Executing command '", vote_parsed_display, "' on server."));
+                                                       bprint("\{1}^2* ^3", VoteCommand_getname(caller), "^2 used their ^3master^2 status to do \"^2", vote_parsed_display, "^2\".\n");
+                                                       if(autocvar_sv_eventlog) { GameLogEcho(strcat(":vote:vdo:", ftos(caller.playerid), ":", vote_parsed_display)); }
+                                               }
+                                               
+                                               return;
+                                       }
+                                       
+                                       case "login":
+                                       {
+                                               if not(autocvar_sv_vote_master_password != "") { print_to(caller, "^1Login to vote master is not allowed."); }
+                                               else if(caller.vote_master) { print_to(caller, "^1You are already logged in as vote master."); }
+                                               else if not(autocvar_sv_vote_master_password == argv(3)) { print_to(caller, strcat("Rejected vote master login from ", VoteCommand_getname(caller))); }
+
+                                               else // everything went okay, proceed with giving this player master privilages
+                                               {
+                                                       caller.vote_master = TRUE;
+                                                       print_to(caller, strcat("Accepted vote master login from ", VoteCommand_getname(caller)));
+                                                       bprint("\{1}^2* ^3", VoteCommand_getname(caller), "^2 logged in as ^3master^2\n");
+                                                       if(autocvar_sv_eventlog) { GameLogEcho(strcat(":vote:vlogin:", ftos(caller.playerid))); }
+                                               }
+                                               
+                                               return;
+                                       }
+                                       
+                                       default: // calling a vote for master
+                                       {
+                                               if not(autocvar_sv_vote_master_callable) { print_to(caller, "^1Vote to become vote master is not allowed."); }
+                                               else if(votecalled) { print_to(caller, "^1There is already a vote called."); }
+                                               
+                                               else // everything went okay, continue with creating vote
+                                               {
+                                                       votecalled = TRUE;
+                                                       votecalledmaster = TRUE;
+                                                       votecalledvote = strzone("XXX");
+                                                       votecalledvote_display = strzone("^3master");
+                                                       votefinished = time + autocvar_sv_vote_timeout;
+                                                       votecaller = caller;
+                                                       
+                                                       caller.vote_selection = VOTE_SELECT_ACCEPT;
+                                                       caller.vote_next = time + autocvar_sv_vote_wait;
+                                                       
+                                                       bprint("\{1}^2* ^3", VoteCommand_getname(votecaller), "^2 calls a vote to become ^3master^2.\n");
+                                                       if(autocvar_sv_eventlog) { GameLogEcho(strcat(":vote:vcall:", ftos(votecaller.playerid), ":", votecalledvote_display)); }
+                                                       Nagger_VoteChanged();
+                                                       VoteCount(); // needed if you are the only one
+                                               }
+                                               
+                                               return;
+                                       }
+                               }
+                       }
+                       else { print_to(caller, "^1Master control of voting is not allowed."); }
+                       
+                       return;
+               }
+                       
+               default:
+               case VC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 vote master action [arguments]\n");
+                       print("  TODO.\n");
+                       return;
+               }
+       }
+}
+
+void VoteCommand_no(float request, entity caller) // CLIENT ONLY
+{
+       switch(request)
+       {
+               case VC_REQUEST_COMMAND:
+               {
+                       if not(votecalled) { print_to(caller, "^1No vote called."); }
+                       else if not(caller.vote_selection == VOTE_SELECT_NULL || autocvar_sv_vote_change) { print_to(caller, "^1You have already voted."); }
+                       
+                       else // everything went okay, continue changing vote
+                       {
+                               print_to(caller, "^1You rejected the vote.");
+                               caller.vote_selection = VOTE_SELECT_REJECT;
+                               msg_entity = caller;
+                               if(!autocvar_sv_vote_singlecount) { VoteCount(); }
+                       }
+                       
+                       return;
+               }
+                       
+               default:
+               case VC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 vote no\n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void VoteCommand_status(float request, entity caller) // BOTH
+{
+       switch(request)
+       {
+               case VC_REQUEST_COMMAND:
+               {
+                       if(votecalled)
+                               print_to(caller, strcat("^7Vote for ", votecalledvote_display, "^7 called by ^7", VoteCommand_getname(votecaller), "^7."));
+                       else
+                               print_to(caller, "^1No vote called.");
+                               
+                       return;
+               }
+                       
+               default:
+               case VC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 vote status\n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void VoteCommand_stop(float request, entity caller) // BOTH
+{
+       switch(request)
+       {
+               case VC_REQUEST_COMMAND:
+               {
+                       if not(votecalled) { print_to(caller, "^1No vote called."); }
+                       else if((caller == votecaller) || !caller || caller.vote_master) { VoteStop(caller); }
+                       else { print_to(caller, "^1You are not allowed to stop that vote."); }
+                       
+                       return;
+               }
+                       
+               default:
+               case VC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 vote stop\n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+void VoteCommand_yes(float request, entity caller) // CLIENT ONLY
+{
+       switch(request)
+       {
+               case VC_REQUEST_COMMAND:
+               {
+                       if not(votecalled) { print_to(caller, "^1No vote called."); }
+                       if not(caller.vote_selection == VOTE_SELECT_NULL || autocvar_sv_vote_change) { print_to(caller, "^1You have already voted."); }
+                       
+                       else // everything went okay, continue changing vote
+                       {
+                               print_to(caller, "^1You accepted the vote.");
+                               caller.vote_selection = VOTE_SELECT_ACCEPT;
+                               msg_entity = caller;
+                               if(!autocvar_sv_vote_singlecount) { VoteCount(); }
+                       }
+                       
+                       return;
+               }
+                       
+               default:
+               case VC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 vote yes\n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+/* use this when creating a new command, making sure to place it in alphabetical order.
+void VoteCommand_(float request)
+{
+       switch(request)
+       {
+               case VC_REQUEST_COMMAND:
+               {
+                       
+                       return;
+               }
+                       
+               default:
+               case VC_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 vote \n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+*/
+
+
+// ================================
+//  Macro system for vote commands
+// ================================
+
+// Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
+#define VOTE_COMMANDS(request,caller,arguments,command) \
+       VOTE_COMMAND("abstain", VoteCommand_abstain(request, caller), "Abstain your vote in current vote", VC_ASGNMNT_CLIENTONLY) \
+       VOTE_COMMAND("call", VoteCommand_call(request, caller, arguments, command), "Create a new vote for players to decide on", VC_ASGNMNT_BOTH) \
+       VOTE_COMMAND("help", VoteCommand_macro_help(caller, arguments), "Shows this information", VC_ASGNMNT_BOTH) \
+       VOTE_COMMAND("master", VoteCommand_master(request, caller, arguments, command), "", VC_ASGNMNT_CLIENTONLY) \
+       VOTE_COMMAND("no", VoteCommand_no(request, caller), "Select no in current vote", VC_ASGNMNT_CLIENTONLY) \
+       VOTE_COMMAND("status", VoteCommand_status(request, caller), "Prints information about current vote", VC_ASGNMNT_BOTH) \
+       VOTE_COMMAND("stop", VoteCommand_stop(request, caller), "Immediately end a vote", VC_ASGNMNT_BOTH) \
+       VOTE_COMMAND("yes", VoteCommand_yes(request, caller), "Select yes in current vote", VC_ASGNMNT_CLIENTONLY) \
+       /* nothing */
+
+void VoteCommand_macro_help(entity caller, float argc)
+{
+       string command_origin = VoteCommand_getprefix(caller);
+       
+       if(argc == 2) // help display listing all commands
+       {
+               print("\nUsage:^3 ", command_origin, " vote COMMAND...^7, where possible commands are:\n");
+               
+               #define VOTE_COMMAND(name,function,description,assignment) \
+                       { if(Votecommand_check_assignment(caller, assignment)) { print("  ^2", name, "^7: ", description, "\n"); } }
+                       
+               VOTE_COMMANDS(0, caller, 0, "")
+               #undef VOTE_COMMAND
+               
+               print("For help about specific commands, type ", command_origin, " vote help COMMAND\n");
+       }
+       else // usage for individual command
+       {
+               #define VOTE_COMMAND(name,function,description,assignment) \
+                       { if(Votecommand_check_assignment(caller, assignment)) { if(name == strtolower(argv(2))) { function; return; } } }
+                       
+               VOTE_COMMANDS(VC_REQUEST_USAGE, caller, argc, "")
+               #undef VOTE_COMMAND
+       }
+       
+       return;
+}
+
+float VoteCommand_macro_command(entity caller, float argc, string vote_command)
+{
+       #define VOTE_COMMAND(name,function,description,assignment) \
+               { if(Votecommand_check_assignment(caller, assignment)) { if(name == strtolower(argv(1))) { function; return TRUE; } } }
+               
+       VOTE_COMMANDS(VC_REQUEST_COMMAND, caller, argc, vote_command)
+       #undef VOTE_COMMAND
+       
+       return FALSE;
+}
+
+
+// ======================================
+//  Main function handling vote commands
+// ======================================
+
+void VoteCommand(float request, entity caller, float argc, string vote_command) 
+{
+       // Guide for working with argc arguments by example:
+       // argc:   1    - 2      - 3     - 4
+       // argv:   0    - 1      - 2     - 3 
+       // cmd     vote - master - login - password
+       
+       switch(request)
+       {
+               case VC_REQUEST_COMMAND:
+               {
+                       if(VoteCommand_macro_command(caller, argc, vote_command))
+                               return;
+               }
+                       
+               default:
+                       print_to(caller, strcat("Unknown vote command", ((argv(1) != "") ? strcat(" \"", argv(1), "\"") : ""), ". For a list of supported commands, try ", VoteCommand_getprefix(caller), " help.\n"));
+               case VC_REQUEST_USAGE:
+               {
+                       VoteCommand_macro_help(caller, argc);
+                       return;
+               }
+       }
+}
+
+// =======================
+//  Game logic for voting
+// =======================
+
+void VoteHelp(entity e) {
+       string vmasterdis;
+       if(!autocvar_sv_vote_master) {
+               vmasterdis = " ^1(disabled)";
+       }
+
+       string vlogindis;
+       if("" == autocvar_sv_vote_master_password) {
+               vlogindis = " ^1(disabled)";
+       }
+
+       string vcalldis;
+       if(!autocvar_sv_vote_call) {
+               vcalldis = " ^1(disabled)";
+       }
+
+       print_to(e, "^7You can use voting with \"^2cmd vote help^7\" \"^2cmd vote status^7\" \"^2cmd vote call ^3COMMAND ARGUMENTS^7\" \"^2cmd vote stop^7\" \"^2cmd vote master^7\" \"^2cmd vote login^7\" \"^2cmd vote do ^3COMMAND ARGUMENTS^7\" \"^2cmd vote yes^7\" \"^2cmd vote no^7\" \"^2cmd vote abstain^7\" \"^2cmd vote dontcare^7\".");
+       print_to(e, "^7Or if your version is up to date you can use these aliases \"^2vhelp^7\" \"^2vstatus^7\" \"^2vcall ^3COMMAND ARGUMENTS^7\" \"^2vstop^7\" \"^2vmaster^7\" \"^2vlogin^7\" \"^2vdo ^3COMMAND ARGUMENTS^7\" \"^2vyes^7\" \"^2vno^7\" \"^2abstain^7\" \"^2vdontcare^7\".");
+       print_to(e, "^7\"^2help^7\" shows this info.");
+       print_to(e, "^7\"^2status^7\" shows if there is a vote called and who called it.");
+       print_to(e, strcat("^7\"^2call^7\" is used to call a vote. See the list of allowed commands.", vcalldis, "^7"));
+       print_to(e, "^7\"^2stop^7\" can be used by the vote caller or an admin to stop a vote and maybe correct it.");
+       print_to(e, strcat("^7\"^2master^7\" call a vote to become master who can execute commands without a vote", vmasterdis, "^7"));
+       print_to(e, strcat("^7\"^2login^7\" login to become master who can execute commands without a vote.", vlogindis, "^7"));
+       print_to(e, "^7\"^2do^7\" executes a command if you are a master. See the list of allowed commands.");
+       print_to(e, "^7\"^2yes^7\", \"^2no^7\", \"^2abstain^7\" and \"^2dontcare^7\" to make your vote.");
+       print_to(e, "^7If enough of the players vote yes the vote is accepted.");
+       print_to(e, "^7If enough of the players vote no the vote is rejected.");
+       print_to(e, strcat("^7If neither the vote will timeout after ", ftos(autocvar_sv_vote_timeout), "^7 seconds."));
+       print_to(e, "^7You can call a vote for or execute these commands:");
+       print_to(e, strcat("^3", autocvar_sv_vote_commands, "^7 and maybe further ^3arguments^7"));
+}
\ No newline at end of file
diff --git a/qcsrc/server/command/vote.qh b/qcsrc/server/command/vote.qh
new file mode 100644 (file)
index 0000000..fb34ba2
--- /dev/null
@@ -0,0 +1,37 @@
+float votecalled;
+string votecalledvote;
+string votecalledvote_display;
+float votecalledmaster;
+entity votecaller;
+float votefinished;
+.float vote_master;
+.float vote_next;
+.float vote_selection;
+float vote_accept_count;
+float vote_reject_count;
+float vote_abstain_count;
+float vote_needed_overall;
+
+string VoteCommand_getname(entity caller);
+void VoteCommand(float request, entity caller, float argc, string vote_command);
+void VoteHelp(entity e);
+void VoteThink();
+void VoteReset();
+void VoteAccept();
+void VoteReject();
+void VoteTimeout();
+void VoteStop(entity stopper);
+void VoteSpam(float notvoters, float mincount, string result);
+void VoteCount();
+
+// =========================
+//  warmup and nagger stuff
+// =========================
+
+#define RESTART_COUNTDOWN 10
+entity nagger;
+.float ready;
+float readycount;
+float readyrestart_happened;
+float restart_mapalreadyrestarted; // bool, indicates whether reset_map() was already executed
+void ReadyCount();
\ No newline at end of file
diff --git a/qcsrc/server/command_common.qc b/qcsrc/server/command_common.qc
deleted file mode 100644 (file)
index 86ff171..0000000
+++ /dev/null
@@ -1,1079 +0,0 @@
-// =========================================================
-//  Server side networked commands code, reworked by Samual
-//  Last updated: December 11th, 2011
-// =========================================================
-
-#define CC_REQUEST_COMMAND 1
-#define CC_REQUEST_USAGE 2
-
-.float cmd_floodtime;
-.float cmd_floodcount;
-.float checkfail;
-.float lms_spectate_warning;
-
-string MapVote_Suggest(string m);
-//void MapVote_SendPicture(float id)
-
-// move any necessary sprint statements to "print_to"
-
-// ============================
-//  Misc. Supporting Functions
-// ============================
-
-float SV_ParseClientCommand_floodcheck()
-{
-       if (timeoutStatus != 2) // if the game is not paused... but wait, doesn't that mean it could be dos'd by pausing it? eh? (old code)
-       {
-               if(time <= (self.cmd_floodtime + autocvar_sv_clientcommand_antispam_time))
-               {
-                       self.cmd_floodcount += 1;
-                       if(self.cmd_floodcount > autocvar_sv_clientcommand_antispam_count) { return FALSE; } // too much spam, halt
-               }
-               else
-               {
-                       self.cmd_floodtime = time;
-                       self.cmd_floodcount = 1;
-               }
-       }
-       return TRUE; // continue, as we're not flooding yet
-}
-
-
-// =======================
-//  Command Sub-Functions
-// =======================
-
-void ClientCommand_autoswitch(float request, float argc)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       self.autoswitch = ("0" != argv(1));
-                       sprint(self, strcat("^1autoswitch is currently turned ", (self.autoswitch ? "on" : "off"), ".\n"));
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd autoswitch selection\n");
-                       sprint(self, "  Where 'selection' is 1 or 0 for on or off.\n"); 
-                       return;
-               }
-       }
-}
-
-void ClientCommand_checkfail(float request, string command) // used only by client side code
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       print(sprintf("CHECKFAIL: %s (%s) epically failed check %s\n", self.netname, self.netaddress, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1))));
-                       self.checkfail = 1;
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd checkfail message\n");
-                       sprint(self, "  Where 'message' is the message reported by client about the fail.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_clientversion(float request, float argc) // used only by client side code
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(self.flags & FL_CLIENT)
-                       {
-                               self.version = ((argv(1) == "$gameversion") ? 1 : stof(argv(1)));
-                               
-                               if(self.version < autocvar_gameversion_min || self.version > autocvar_gameversion_max)
-                               {
-                                       self.version_mismatch = 1;
-                                       ClientKill_TeamChange(-2); // observe
-                               } 
-                               else if(autocvar_g_campaign || autocvar_g_balance_teams || autocvar_g_balance_teams_force) 
-                               {
-                                       //JoinBestTeam(self, FALSE, TRUE);
-                               } 
-                               else if(teamplay && !autocvar_sv_spectate && !(self.team_forced > 0)) 
-                               {
-                                       self.classname = "observer"; // really?
-                                       stuffcmd(self, "menu_showteamselect\n");
-                               }
-                       }
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd clientversion version\n");
-                       sprint(self, "  Where 'version' is the game version reported by self.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_cvar_changes(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       sprint(self, cvar_changes);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 sv_cmd cvar_changes\n");
-                       sprint(self, "  No arguments required.\n");
-                       //sprint(self, "See also: ^2cvar_purechanges^7\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_cvar_purechanges(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       sprint(self, cvar_purechanges);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 sv_cmd cvar_purechanges\n");
-                       sprint(self, "  No arguments required.\n");
-                       //sprint(self, "See also: ^2cvar_changes^7\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_getmapvotepic(float request, float argc)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(intermission_running)                                
-                               MapVote_SendPicture(stof(argv(1)));
-
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd getmapvotepic mapid\n");
-                       sprint(self, "  Where 'mapid' is the id number of the map to request an image of on the map vote selection menu.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_info(float request, float argc)
-{      
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       string command;
-                       
-                       command = builtin_cvar_string(strcat("sv_info_", argv(1))); 
-                       if(command)
-                               wordwrap_sprint(command, 1111); // why 1111?
-                       else
-                               sprint(self, "ERROR: unsupported info command\n");
-                               
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd info request\n");
-                       sprint(self, "  Where 'request' is the suffixed string appended onto the request for cvar.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_join(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(self.flags & FL_CLIENT)
-                       {
-                               if(self.classname != "player" && !lockteams && !g_arena)
-                               {
-                                       if(nJoinAllowed(1)) 
-                                       {
-                                               if(g_ca) { self.caplayer = 1; }
-                                               if(autocvar_g_campaign) { campaign_bots_may_start = 1; }
-                                               
-                                               self.classname = "player";
-                                               PlayerScore_Clear(self);
-                                               bprint ("^4", self.netname, "^4 is playing now\n");
-                                               PutClientInServer();
-                                       }
-                                       else 
-                                       {
-                                               //player may not join because of g_maxplayers is set
-                                               centerprint(self, PREVENT_JOIN_TEXT);
-                                       }
-                               }
-                       }
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd join\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_ladder(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       sprint(self, ladder_reply);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd ladder\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_lsmaps(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       sprint(self, lsmaps_reply);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd lsmaps\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_lsnewmaps(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       sprint(self, lsnewmaps_reply);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd lsnewmaps\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_maplist(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       sprint(self, maplist_reply);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd maplist\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_rankings(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       sprint(self, rankings_reply);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd rankings\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_ready(float request) 
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(self.flags & FL_CLIENT)
-                       {
-                               if(inWarmupStage || autocvar_sv_ready_restart || g_race_qualifying == 2)
-                               {
-                                       if(!readyrestart_happened || autocvar_sv_ready_restart_repeatable)
-                                       {
-                                               if (self.ready) // toggle
-                                               {
-                                                       self.ready = FALSE;
-                                                       bprint(self.netname, "^2 is ^1NOT^2 ready\n");
-                                               }
-                                               else
-                                               {
-                                                       self.ready = TRUE;
-                                                       bprint(self.netname, "^2 is ready\n");
-                                               }
-
-                                               // cannot reset the game while a timeout is active!
-                                               if(!timeoutStatus)
-                                                       ReadyCount();
-                                       } else {
-                                               sprint(self, "^1Game has already been restarted\n");
-                                       }
-                               }
-                       }
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd ready\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_records(float request) // TODO: Isn't this flooding with the sprint messages? Old code, but perhaps bad?
-{      
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       float i;
-                       
-                       for(i = 0; i < 10; ++i)
-                               sprint(self, records_reply[i]);
-                               
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd records\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_reportcvar(float request, float argc, string command) // TODO: confirm this works
-{      
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       float tokens;
-                       string s;
-                       
-                       if(substring(argv(2), 0, 1) == "$") // undefined cvar: use the default value on the server then
-                       {
-                               s = strcat(substring(command, argv_start_index(0), argv_end_index(1) - argv_start_index(0)), " \"", cvar_defstring(argv(1)), "\"");
-                               tokens = tokenize_console(s);
-                       }
-                       GetCvars(1);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd reportcvar <cvar>\n");
-                       sprint(self, "  Where 'cvar' is the cvar plus arguments to send to the server.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_say(float request, float argc, string command)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(argc >= 2) { Say(self, FALSE, world, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); }
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd say <message>\n");
-                       sprint(self, "  Where 'message' is the string of text to say.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_say_team(float request, float argc, string command)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(argc >= 2) { Say(self, TRUE, world, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); }
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd say_team <message>\n");
-                       sprint(self, "  Where 'message' is the string of text to say.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_selectteam(float request, float argc) // TODO: Update the messages for this command
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       float selection;
-                       
-                       if (self.flags & FL_CLIENT)
-                       {
-                               if(teamplay)
-                                       if not(self.team_forced > 0) 
-                                               if not(lockteams) 
-                                               {
-                                                       switch(argv(1))
-                                                       {
-                                                               case "red": selection = COLOR_TEAM1; break;
-                                                               case "blue": selection = COLOR_TEAM2; break;
-                                                               case "yellow": selection = COLOR_TEAM3; break;
-                                                               case "pink": selection = COLOR_TEAM4; break;
-                                                               case "auto": selection = (-1); break;
-                                                               
-                                                               default: break;
-                                                       }
-                                                       
-                                                       if(selection)
-                                                       {
-                                                               if(self.team == selection && self.deadflag == DEAD_NO)
-                                                                       sprint(self, "^7You already are on that team.\n");
-                                                               else if(self.wasplayer && autocvar_g_changeteam_banned)
-                                                                       sprint(self, "^1You cannot change team, forbidden by the server.\n");
-                                                               else
-                                                                       ClientKill_TeamChange(selection);
-                                                       }
-                                               }
-                                               else
-                                                       sprint(self, "^7The game has already begun, you must wait until the next map to be able to join a team.\n");
-                                       else
-                                               sprint(self, "^7selectteam can not be used as your team is forced\n");
-                               else
-                                       sprint(self, "^7selectteam can only be used in teamgames\n");
-                       }
-                       return; // never fall through to usage
-               }
-
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       //sprint(self, strcat( "selectteam none/red/blue/yellow/pink/auto - \"", argv(1), "\" not recognised\n" ) );
-                       sprint(self, "\nUsage:^3 cmd selectteam team\n");
-                       sprint(self, "  Where 'team' is the prefered team to try and join.\n");
-                       sprint(self, "  Full list of options here: \"red, blue, yellow, pink, auto\"\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_selfstuff(float request, string command)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       stuffcmd(self, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)));
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd selfstuff command\n");
-                       sprint(self, "  Where 'command' is the string to be stuffed to your client.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_sentcvar(float request, float argc, string command)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       float tokens;
-                       string s;
-                       
-                       if(argc == 2) // undefined cvar: use the default value on the server then
-                       {
-                               s = strcat(substring(command, argv_start_index(0), argv_end_index(1) - argv_start_index(0)), " \"", cvar_defstring(argv(1)), "\"");
-                               tokens = tokenize_console(s);
-                       }
-                       GetCvars(1);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd sentcvar <cvar>\n");
-                       sprint(self, "  Where 'cvar' is the cvar plus arguments to send to the server.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_spectate(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(self.flags & FL_CLIENT)
-                       {
-                               if(g_arena) { return; } 
-                               if(g_lms)
-                               {
-                                       if(self.lms_spectate_warning)
-                                       {
-                                               // mark player as spectator
-                                               PlayerScore_Add(self, SP_LMS_RANK, 666 - PlayerScore_Add(self, SP_LMS_RANK, 0));
-                                       }
-                                       else
-                                       {
-                                               self.lms_spectate_warning = 1;
-                                               sprint(self, "WARNING: you won't be able to enter the game again after spectating in LMS. Use the same command again to spectate anyway.\n");
-                                               return;
-                                       }
-                               }
-                               
-                               if(self.classname == "player" && autocvar_sv_spectate == 1) 
-                                       ClientKill_TeamChange(-2); // observe
-                               
-                               // in CA, allow a dead player to move to spectatators (without that, caplayer!=0 will be moved back to the player list)
-                               // note: if arena game mode is ever done properly, this needs to be removed.
-                               if(g_ca && self.caplayer && (self.classname == "spectator" || self.classname == "observer"))
-                               {
-                                       sprint(self, "WARNING: you will spectate in the next round.\n");
-                                       self.caplayer = 0;
-                               }
-                       }
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd spectate\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_suggestmap(float request, float argc)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       sprint(self, strcat(MapVote_Suggest(argv(1)), "\n"));
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd suggestmap map\n");
-                       sprint(self, "  Where 'map' is the name of the map to suggest.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_teamstatus(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       Score_NicePrint(self);
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd teamstatus\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_tell(float request, float argc, string command)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       entity e = GetCommandPlayerSlotTargetFromTokenizedCommand(argc, 1);
-                       
-                       if(e && argc > ParseCommandPlayerSlotTarget_firsttoken)
-                       {
-                               Say(self, FALSE, e, substring(command, argv_start_index(ParseCommandPlayerSlotTarget_firsttoken), argv_end_index(-1) - argv_start_index(ParseCommandPlayerSlotTarget_firsttoken)), TRUE);
-                       }
-                       else
-                       {
-                               if(argc > ParseCommandPlayerSlotTarget_firsttoken)
-                                       trigger_magicear_processmessage_forallears(self, -1, world, substring(command, argv_start_index(ParseCommandPlayerSlotTarget_firsttoken), argv_end_index(-1) - argv_start_index(ParseCommandPlayerSlotTarget_firsttoken)));
-                       }
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd tell playerid <message>\n");
-                       sprint(self, "  Where 'playerid' is the entity number of the player to send the 'message' to.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_timein(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(self.flags & FL_CLIENT)
-                       {
-                               if(autocvar_sv_timeout)
-                               {
-                                       if (!timeoutStatus)
-                                               return sprint(self, "^7Error: There is no active timeout which could be aborted!\n");
-                                       if (self != timeoutInitiator)
-                                               return sprint(self, "^7Error: You may not abort the active timeout. Only the player who called it can do that!\n");
-                                               
-                                       if (timeoutStatus == 1) 
-                                       {
-                                               remainingTimeoutTime = timeoutStatus = 0;
-                                               timeoutHandler.nextthink = time; //timeoutHandler has to take care of it immediately
-                                               bprint(strcat("^7The timeout was aborted by ", self.netname, " !\n"));
-                                       }
-                                       else if (timeoutStatus == 2) 
-                                       {
-                                               //only shorten the remainingTimeoutTime if it makes sense
-                                               if( remainingTimeoutTime > (autocvar_sv_timeout_resumetime + 1) ) 
-                                               {
-                                                       bprint(strcat("^1Attention: ^7", self.netname, " resumed the game! Prepare for battle!\n"));
-                                                       remainingTimeoutTime = autocvar_sv_timeout_resumetime;
-                                                       timeoutHandler.nextthink = time; //timeoutHandler has to take care of it immediately
-                                               }
-                                               else
-                                                       sprint(self, "^7Error: Your resumegame call was discarded!\n");
-                                       }
-                               }
-                       }
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd timein\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_timeout(float request) // DEAR GOD THIS COMMAND IS TERRIBLE.
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(self.flags & FL_CLIENT)
-                       {
-                               if(autocvar_sv_timeout) 
-                               {
-                                       if(self.classname == "player") 
-                                       {
-                                               if(votecalled)
-                                                       sprint(self, "^7Error: you can not call a timeout while a vote is active!\n");
-                                               else
-                                               {
-                                                       if (inWarmupStage && !g_warmup_allow_timeout)
-                                                               return sprint(self, "^7Error: You can not call a timeout in warmup-stage!\n");
-                                                       if (time < game_starttime )
-                                                               return sprint(self, "^7Error: You can not call a timeout while the map is being restarted!\n");
-                                                               
-                                                       if (timeoutStatus != 2) {
-                                                               //if the map uses a timelimit make sure that timeout cannot be called right before the map ends
-                                                               if (autocvar_timelimit) {
-                                                                       //a timelimit was used
-                                                                       float myTl;
-                                                                       myTl = autocvar_timelimit;
-
-                                                                       float lastPossibleTimeout;
-                                                                       lastPossibleTimeout = (myTl*60) - autocvar_sv_timeout_leadtime - 1;
-
-                                                                       if (lastPossibleTimeout < time - game_starttime)
-                                                                               return sprint(self, "^7Error: It is too late to call a timeout now!\n");
-                                                               }
-                                                       }
-                                                       
-                                                       //player may not call a timeout if he has no calls left
-                                                       if (self.allowedTimeouts < 1)
-                                                               return sprint(self, "^7Error: You already used all your timeout calls for this map!\n");
-                                                               
-                                                               
-                                                       //now all required checks are passed
-                                                       self.allowedTimeouts -= 1;
-                                                       bprint(self.netname, " ^7called a timeout (", ftos(self.allowedTimeouts), " timeouts left)!\n"); //write a bprint who started the timeout (and how many he has left)
-                                                       remainingTimeoutTime = autocvar_sv_timeout_length;
-                                                       remainingLeadTime = autocvar_sv_timeout_leadtime;
-                                                       timeoutInitiator = self;
-                                                       if (timeoutStatus == 0) { //if another timeout was already active, don't change its status (which was 1 or 2) to 1, only change it to 1 if no timeout was active yet
-                                                               timeoutStatus = 1;
-                                                               //create the timeout indicator which centerprints the information to all players and takes care of pausing/unpausing
-                                                               timeoutHandler = spawn();
-                                                               timeoutHandler.think = timeoutHandler_Think;
-                                                       }
-                                                       timeoutHandler.nextthink = time; //always let the entity think asap
-
-                                                       //inform all connected clients about the timeout call
-                                                       Announce("timeoutcalled");
-                                               }
-                                       }
-                                       else
-                                               sprint(self, "^7Error: only players can call a timeout!\n");
-                               }
-                       }
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd timeout\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void ClientCommand_voice(float request, float argc, string command)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       if(argc >= 3)
-                               VoiceMessage(argv(1), substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2)));
-                       else
-                               VoiceMessage(argv(1), "");
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd voice\n");
-                       sprint(self, "  FIXME ARGUMENTS UNKNOWN.\n");
-                       return;
-               }
-       }
-}
-
-string strlimitedlen(string input, float strip_colors, float limit)
-{
-       if(strlen((strip_colors ? strdecolorize(input) : input)) <= limit)
-               return input;
-       else
-               return strcat(substring(input, 0, (strlen(input) - 3)), "...");
-}
-
-void ClientCommand_who(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       float total_listed_players, tmp_hours, tmp_minutes, tmp_seconds;
-                       entity tmp_player;
-                       string tmp_player_name;
-                       
-                       sprint(self, strcat("List of client information", (autocvar_sv_status_privacy ? " (some data is hidden for privacy)" : string_null), ":\n"));
-                       sprint(self, sprintf(" %-4s %-20s %-5s %-3s %-9s %-16s %s\n", "ent", "nickname", "ping", "pl", "time", "ip", "crypto_id"));
-                       
-                       FOR_EACH_CLIENT(tmp_player)
-                       {
-                               tmp_player_name = strlimitedlen(tmp_player.netname, TRUE, 20);
-                               
-                               tmp_hours = tmp_minutes = tmp_seconds = 0;
-                               
-                               tmp_seconds = (time - tmp_player.jointime);
-                               tmp_minutes = (tmp_seconds / 60);
-                               
-                               if(tmp_minutes)
-                               {
-                                       tmp_seconds -= (tmp_minutes * 60);
-                                       tmp_hours = (tmp_minutes / 60);
-                                       
-                                       if(tmp_hours) { tmp_minutes -= (tmp_hours * 60); }
-                               }
-                               
-                               sprint(self, sprintf(" %-4s %-20s %-5d %-3d %-9s %-16s %s\n", 
-                                       strcat("#", ftos(num_for_edict(tmp_player))), 
-                                       tmp_player.netname, //strcat(tmp_player_name, sprintf("%*s", (20 - strlen(strdecolorize(tmp_player_name))), "")),
-                                       tmp_player.ping, tmp_player.ping_packetloss, 
-                                       sprintf("%02d:%02d:%02d", tmp_hours, tmp_minutes, tmp_seconds),
-                                       (autocvar_sv_status_privacy ? "hidden" : tmp_player.netaddress),
-                                       (autocvar_sv_status_privacy ? "hidden" : tmp_player.crypto_idfp)));
-                                       
-                               ++total_listed_players;
-                       }
-                       
-                       sprint(self, strcat("Finished listing ", ftos(total_listed_players), " client(s). \n"));
-                       
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd who\n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-/* use this when creating a new command, making sure to place it in alphabetical order.
-void ClientCommand_(float request)
-{
-       switch(request)
-       {
-               case CC_REQUEST_COMMAND:
-               {
-                       
-                       return; // never fall through to usage
-               }
-                       
-               default:
-               case CC_REQUEST_USAGE:
-               {
-                       sprint(self, "\nUsage:^3 cmd \n");
-                       sprint(self, "  No arguments required.\n");
-                       return;
-               }
-       }
-}
-*/
-
-
-// =====================================
-//  Macro system for networked commands
-// =====================================
-
-// Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
-#define CLIENT_COMMANDS(request,arguments,command) \
-       CLIENT_COMMAND("autoswitch", ClientCommand_autoswitch(request, arguments), "Whether or not to switch automatically when getting a better weapon") \
-       CLIENT_COMMAND("checkfail", ClientCommand_checkfail(request, command), "Report if a client-side check failed") \
-       CLIENT_COMMAND("clientversion", ClientCommand_clientversion(request, arguments), "Release version of the game") \
-       CLIENT_COMMAND("cvar_changes", ClientCommand_cvar_changes(request), "Prints a list of all changed server cvars") \
-       CLIENT_COMMAND("cvar_purechanges", ClientCommand_cvar_purechanges(request), "Prints a list of all changed gameplay cvars") \
-       CLIENT_COMMAND("getmapvotepic", ClientCommand_getmapvotepic(request, arguments), "Retrieve mapshot picture from the server") \
-       CLIENT_COMMAND("info", ClientCommand_info(request, arguments), "Request for unique server information set up by admin") \
-       CLIENT_COMMAND("join", ClientCommand_join(request), "Become a player in the game") \
-       CLIENT_COMMAND("ladder", ClientCommand_ladder(request), "Get information about top players if supported") \
-       CLIENT_COMMAND("lsmaps", ClientCommand_lsmaps(request), "List maps which can be used with the current game mode") \
-       CLIENT_COMMAND("lsnewmaps", ClientCommand_lsnewmaps(request), "List maps which TODO") \
-       CLIENT_COMMAND("maplist", ClientCommand_maplist(request), "Full server maplist reply") \
-       CLIENT_COMMAND("rankings", ClientCommand_rankings(request), "Print information about rankings") \
-       CLIENT_COMMAND("ready", ClientCommand_ready(request), "Qualify as ready to end warmup stage (or restart server if allowed)") \
-       CLIENT_COMMAND("records", ClientCommand_records(request), "List top 10 records for the current map") \
-       CLIENT_COMMAND("reportcvar", ClientCommand_reportcvar(request, arguments, command), "Old system for sending a client cvar to the server") \
-       CLIENT_COMMAND("say", ClientCommand_say(request, arguments, command), "Print a message to chat to all players") \
-       CLIENT_COMMAND("say_team", ClientCommand_say_team(request, arguments, command), "Print a message to chat to all team mates") \
-       CLIENT_COMMAND("selectteam", ClientCommand_selectteam(request, arguments), "Attempt to choose a team to join into") \
-       CLIENT_COMMAND("selfstuff", ClientCommand_selfstuff(request, command), "Stuffcmd a command to your own client") \
-       CLIENT_COMMAND("sentcvar", ClientCommand_sentcvar(request, arguments, command), "New system for sending a client cvar to the server") \
-       CLIENT_COMMAND("spectate", ClientCommand_spectate(request), "Become an observer") \
-       CLIENT_COMMAND("suggestmap", ClientCommand_suggestmap(request, arguments), "Suggest a map to the mapvote at match end") \
-       CLIENT_COMMAND("teamstatus", ClientCommand_teamstatus(request), "Print detailed score information for all players") \
-       CLIENT_COMMAND("tell", ClientCommand_tell(request, arguments, command), "Send a message directly to a player") \
-       CLIENT_COMMAND("timein", ClientCommand_timein(request), "Resume the game from being paused with a timeout") \
-       CLIENT_COMMAND("timeout", ClientCommand_timeout(request), "Call a timeout which pauses the game for certain amount of time unless unpaused") \
-       CLIENT_COMMAND("voice", ClientCommand_voice(request, arguments, command), "Send voice message via sound") \
-       CLIENT_COMMAND("vote", VoteCommand(request, self, arguments, command), "Request an action to be voted upon by players") \
-       CLIENT_COMMAND("who", ClientCommand_who(request), "Display detailed client information about all players") \
-       /* nothing */
-       
-void ClientCommand_macro_help()
-{
-       #define CLIENT_COMMAND(name,function,description) \
-               { print("  ^2", name, "^7: ", description, "\n"); }
-               
-       CLIENT_COMMANDS(0, 0, "")
-       #undef CLIENT_COMMAND
-       
-       return;
-}
-
-float ClientCommand_macro_command(float argc, string command)
-{
-       #define CLIENT_COMMAND(name,function,description) \
-               { if(name == strtolower(argv(0))) { function; return TRUE; } }
-               
-       CLIENT_COMMANDS(CC_REQUEST_COMMAND, argc, command)
-       #undef CLIENT_COMMAND
-       
-       return FALSE;
-}
-
-float ClientCommand_macro_usage(float argc, string command)
-{
-       #define CLIENT_COMMAND(name,function,description) \
-               { if(name == strtolower(argv(1))) { function; return TRUE; } }
-               
-       CLIENT_COMMANDS(CC_REQUEST_USAGE, argc, command)
-       #undef CLIENT_COMMAND
-       
-       return FALSE;
-}
-
-
-// ======================================
-//  Main Function Called By Engine (cmd)
-// ======================================
-// If this function exists, server game code parses clientcommand before the engine code gets it.
-
-void SV_ParseClientCommand(string command)
-{
-       float argc = tokenize_console(command);
-       
-       // for floodcheck
-       switch(strtolower(argv(0)))
-       {
-               // exempt commands which are not subject to floodcheck
-               case "begin": break; // handled by engine in host_cmd.c
-               case "getmapvotepic": break; // handled by server in this file
-               case "pause": break; // handled by engine in host_cmd.c
-               case "prespawn": break; // handled by engine in host_cmd.c
-               case "reportcvar": break; // handled by server in this file
-               case "sentcvar": break; // handled by server in this file
-               case "spawn": break; // handled by engine in host_cmd.c
-               
-               default: 
-                       if(SV_ParseClientCommand_floodcheck())
-                               break; // "TRUE": continue, as we're not flooding yet
-                       else
-                               return; // "FALSE": not allowed to continue, halt
-       }
-       
-       /* NOTE: totally disabled for now, however the functionality and descriptions are there if we ever want it.
-       if(argv(0) == "help") 
-       {
-               if(argc == 1) 
-               {
-                       sprint(self, "\nUsage:^3 cmd COMMAND...^7, where possible commands are:\n");
-                       ClientCommand_macro_help;
-                       sprint(self, "For help about specific commands, type cmd help COMMAND\n");
-                       return;
-               } 
-               else if(ClientCommand_macro_usage(argc, command)) // Instead of trying to call a command, we're going to see detailed information about it
-               {
-                       return;
-               }
-       } 
-       else*/ if(MUTATOR_CALLHOOK(SV_ParseClientCommand))
-       {
-               return; // handled by a mutator
-       }
-       else if(CheatCommand(argc)) 
-       {
-               return; // handled by server/cheats.qc
-       }
-       else if(ClientCommand_macro_command(argc, command)) // continue as usual and scan for normal commands
-       {
-               return; // handled by one of the above GameCommand_* functions
-       }
-       else
-               clientcommand(self, command);
-}
\ No newline at end of file
diff --git a/qcsrc/server/gamecommand.qc b/qcsrc/server/gamecommand.qc
deleted file mode 100644 (file)
index 7d24f2e..0000000
+++ /dev/null
@@ -1,2010 +0,0 @@
-// =====================================================
-//  Server side game commands code, reworked by Samual
-//  Last updated: December 6th, 2011
-// =====================================================
-
-#define GC_REQUEST_COMMAND 1
-#define GC_REQUEST_USAGE 2
-
-float RadarMap_Make(float argc);
-
-string GotoMap(string m);
-
-void race_deleteTime(string map, float pos);
-
-#define SHUFFLETEAMS_MAX_PLAYERS 255
-#define SHUFFLETEAMS_MAX_TEAMS 4
-float shuffleteams_players[SHUFFLETEAMS_MAX_PLAYERS]; // maximum of 255 player slots
-float shuffleteams_teams[SHUFFLETEAMS_MAX_TEAMS]; // maximum of 4 teams
-
-
-// ============================
-//  Misc. Supporting Functions
-// ============================
-
-//  used by GameCommand_make_mapinfo()
-void make_mapinfo_Think()
-{
-       if(MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 0, 0, 1))
-       {
-               print("Done rebuiling mapinfos.\n");
-               MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0);
-               remove(self);
-       }
-       else
-       {
-               self.think = make_mapinfo_Think;
-               self.nextthink = time;
-       }
-}
-
-//  used by GameCommand_extendmatchtime() and GameCommand_reducematchtime()
-void changematchtime(float delta, float mi, float ma)
-{
-       float cur;
-       float new;
-       float lim;
-
-       if(delta == 0)
-               return;
-       if(autocvar_timelimit < 0)
-               return;
-
-       if(mi <= 10)
-               mi = 10; // at least ten sec in the future
-       cur = time - game_starttime;
-       if(cur > 0)
-               mi += cur; // from current time!
-
-       lim = autocvar_timelimit * 60;
-
-       if(delta > 0)
-       {
-               if(lim == 0)
-                       return; // cannot increase any further
-               else if(lim < ma)
-                       new = min(ma, lim + delta);
-               else // already above maximum: FAIL
-                       return;
-       }
-       else
-       {
-               if(lim == 0) // infinite: try reducing to max, if we are allowed to
-                       new = max(mi, ma);
-               else if(lim > mi) // above minimum: decrease
-                       new = max(mi, lim + delta);
-               else // already below minimum: FAIL
-                       return;
-       }
-
-       cvar_set("timelimit", ftos(new / 60));
-}
-
-//  used by GameCommand_modelbug() // TODO: 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
-// =======================
-
-void GameCommand_adminmsg(float request, float argc) // todo: re-write this, plus support multiple clients at once like moveplayer
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       entity client;
-                       float entno = stof(argv(1)); 
-                       float n, i;
-                       string s;
-                       
-                       if(argc >= 3 && argc <= 4) {
-                               if((entno < 0) | (entno > maxclients)) {
-                                       print("Player ", argv(1), " doesn't exist\n");
-                                       return;
-                               }
-                               n = 0;
-                               for(i = (entno ? entno : 1); i <= (entno ? entno : maxclients); ++i)
-                               {
-                                       client = edict_num(i);
-                                       if(client.flags & FL_CLIENT)
-                                       {
-                                               if(argc == 4)
-                                               {
-                                                       // make the string console safe
-                                                       s = argv(2);
-                                                       s = strreplace("\n", "", s);
-                                                       s = strreplace("\\", "\\\\", s);
-                                                       s = strreplace("$", "$$", s);
-                                                       s = strreplace("\"", "\\\"", s);
-                                                       stuffcmd(client, sprintf("\ninfobar %f \"%s\"\n", stof(argv(3)), s));
-                                               }
-                                               else
-                                               {
-                                                       centerprint(client, strcat("^3", admin_name(), ":\n\n^7", argv(2)));
-                                                       sprint(client, strcat("\{1}\{13}^3", admin_name(), "^7: ", argv(2), "\n"));
-                                               }
-                                               dprint("Message sent to ", client.netname, "\n");
-                                               ++n;
-                                       }
-                               }
-                               if(!n) { print(strcat("Client (", argv(1) ,") not found.\n")); } 
-                               return;
-                       }
-               }
-               
-               default:
-                       print("Incorrect parameters for ^2adminmsg^7\n");
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd adminmsg clientnumber \"message\" [infobartime]\n");
-                       print("  If infobartime is provided, the message will be sent to infobar.\n");
-                       print("  Otherwise, it will just be sent as a centerprint message.\n");
-                       print("Examples: adminmsg 4 \"this infomessage will last for ten seconds\" 10\n");
-                       print("          adminmsg 2 \"this message will be a centerprint\"\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_allready(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       ReadyRestart();
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd allready\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_allspec(float request, float argc)
-{      
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       entity client;
-                       string reason = argv(1);
-                       float i;
-                       
-                       FOR_EACH_REALPLAYER(client)
-                       {
-                               self = client;
-                               PutObserverInServer();
-                               ++i;
-                       }
-                       if(i) { bprint(strcat("Successfully forced all (", ftos(i), ") players to spectate", (reason ? strcat(" for reason: '", reason, "'") : ""), ".\n")); }
-                       else { print("No players found to spectate.\n"); }
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd allspec [reason]\n");
-                       print("  Where 'reason' is an optional argument for explanation of allspec command.\n");
-                       print("See also: ^2moveplayer, shuffleteams^7\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_anticheat(float request, float argc)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       entity client;
-                       float entno = stof(argv(1)); 
-                       
-                       if((entno < 1) | (entno > maxclients)) {
-                               print("Player ", argv(1), " doesn't exist\n");
-                               return;
-                       }
-                       client = edict_num(entno);
-                       if(clienttype(client) != CLIENTTYPE_REAL || clienttype(client) != CLIENTTYPE_BOT) {
-                               print("Player ", client.netname, " is not active\n");
-                               return;
-                       }
-                       self = client;
-                       anticheat_report();
-                       return;
-               }
-                       
-               default:
-                       print("Incorrect parameters for ^2anticheat^7\n");
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd anticheat clientnumber\n");
-                       print("  where 'clientnumber' is player entity number.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_bbox(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       print("Original size: ", ftos(world.absmin_x), " ", ftos(world.absmin_y), " ", ftos(world.absmin_z));
-                       print(" ", ftos(world.absmax_x), " ", ftos(world.absmax_y), " ", ftos(world.absmax_z), "\n");
-                       print("Currently set size: ", ftos(world.mins_x), " ", ftos(world.mins_y), " ", ftos(world.mins_z));
-                       print(" ", ftos(world.maxs_x), " ", ftos(world.maxs_y), " ", ftos(world.maxs_z), "\n");
-                       print("Solid bounding box size:");
-
-                       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,
-                                       world);
-                       if(trace_startsolid)
-                               print(" ", ftos(world.absmin_x));
-                       else
-                               print(" ", ftos(trace_endpos_x));
-
-                       tracebox('0 1 0' * world.absmin_y,
-                                                       '1 0 0' * world.absmin_x + '0 0 1' * world.absmin_z,
-                                                       '1 0 0' * world.absmax_x + '0 0 1' * world.absmax_z,
-                                                       '0 1 0' * world.absmax_y,
-                                       MOVE_WORLDONLY,
-                                       world);
-                       if(trace_startsolid)
-                               print(" ", ftos(world.absmin_y));
-                       else
-                               print(" ", ftos(trace_endpos_y));
-
-                       tracebox('0 0 1' * world.absmin_z,
-                                                       '1 0 0' * world.absmin_x + '0 1 0' * world.absmin_y,
-                                                       '1 0 0' * world.absmax_x + '0 1 0' * world.absmax_y,
-                                                       '0 0 1' * world.absmax_z,
-                                       MOVE_WORLDONLY,
-                                       world);
-                       if(trace_startsolid)
-                               print(" ", ftos(world.absmin_z));
-                       else
-                               print(" ", ftos(trace_endpos_z));
-
-                       tracebox('1 0 0' * world.absmax_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.absmin_x,
-                                       MOVE_WORLDONLY,
-                                       world);
-                       if(trace_startsolid)
-                               print(" ", ftos(world.absmax_x));
-                       else
-                               print(" ", ftos(trace_endpos_x));
-
-                       tracebox('0 1 0' * world.absmax_y,
-                                                       '1 0 0' * world.absmin_x + '0 0 1' * world.absmin_z,
-                                                       '1 0 0' * world.absmax_x + '0 0 1' * world.absmax_z,
-                                                       '0 1 0' * world.absmin_y,
-                                       MOVE_WORLDONLY,
-                                       world);
-                       if(trace_startsolid)
-                               print(" ", ftos(world.absmax_y));
-                       else
-                               print(" ", ftos(trace_endpos_y));
-
-                       tracebox('0 0 1' * world.absmax_z,
-                                                       '1 0 0' * world.absmin_x + '0 1 0' * world.absmin_y,
-                                                       '1 0 0' * world.absmax_x + '0 1 0' * world.absmax_y,
-                                                       '0 0 1' * world.absmin_z,
-                                       MOVE_WORLDONLY,
-                                       world);
-                       if(trace_startsolid)
-                               print(" ", ftos(world.absmax_z));
-                       else
-                               print(" ", ftos(trace_endpos_z));
-                               
-                       print("\n");
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd bbox\n");
-                       print("  No arguments required.\n");
-                       print("See also: ^2gettaginfo^7\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_bot_cmd(float request, float argc) // what a mess... old old code.
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       entity bot;
-                       
-                       if(argv(1) == "reset")
-                       {
-                               bot_resetqueues();
-                               return;
-                       }
-                       else if(argv(1) == "load" && argc == 3)
-                       {
-                               float fh, i;
-                               string s;
-                               fh = fopen(argv(2), FILE_READ);
-                               if(fh < 0)
-                               {
-                                       print("cannot open the file\n");
-                                       return;
-                               }
-
-                               i = 0;
-                               while((s = fgets(fh)))
-                               {
-                                       argc = tokenize_console(s);
-
-                                       if(argc >= 3 && argv(0) == "sv_cmd" && argv(1) == "bot_cmd")
-                                       {
-                                               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"));
-
-                                       ++i;
-                               }
-                               print(ftos(i), " commands read\n");
-                               fclose(fh);
-                               return;
-                       }
-                       else if(argv(1) == "help")
-                       {
-                               if(argv(2))
-                                       bot_cmdhelp(argv(2));
-                               else
-                                       bot_list_commands();
-                               return;
-                       }
-                       else if(argc >= 3) // this comes last
-                       {
-                               bot = find_bot_by_number(stof(argv(1)));
-                               if(bot == world)
-                                       bot = find_bot_by_name(argv(1));
-                               if(bot)
-                               {
-                                       print(strcat("Command '", strcat(argv(2), " ", argv(3)), "' sent to bot ", bot.netname, "\n"));
-                                       bot_queuecommand(bot, strcat(argv(2), " ", argv(3)));
-                                       return;
-                               }
-                               else
-                                       print(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
-                       }
-               }
-                       
-               default:
-                       print("Incorrect parameters for ^2bot_cmd^7\n");
-               case GC_REQUEST_USAGE:
-               {
-                       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");
-                       return;
-               }
-       }
-}
-
-void GameCommand_cointoss(float request, float argc)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       entity client;
-                       string result1 = (argv(2) ? strcat("^7", argv(1), "^3!\n") : "^1HEADS^3!\n");
-                       string result2 = (argv(2) ? strcat("^7", argv(2), "^3!\n") : "^4TAILS^3!\n");
-                       string choice = ((random() > 0.5) ? result1 : result2);
-                       
-                       FOR_EACH_CLIENT(client)
-                               centerprint(client, strcat("^3Throwing coin... Result: ", choice));
-                       bprint(strcat("^3Throwing coin... Result: ", choice));
-                       return;
-               }
-               
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd cointoss [result1 result2]\n");
-                       print("  Where 'result1' and 'result2' are user created options.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_cvar_changes(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       print(cvar_changes);
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd cvar_changes\n");
-                       print("  No arguments required.\n");
-                       print("See also: ^2cvar_purechanges^7\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_cvar_purechanges(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       print(cvar_purechanges);
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd cvar_purechanges\n");
-                       print("  No arguments required.\n");
-                       print("See also: ^2cvar_changes^7\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_database(float request, float argc)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       if(argc == 3)
-                       {
-                               if(argv(1) == "save")
-                               {
-                                       db_save(ServerProgsDB, argv(2));
-                                       print(strcat("Copied serverprogs database to '", argv(2), "' in the data directory.\n"));
-                                       return;
-                               }
-                               else if(argv(1) == "dump")
-                               {
-                                       db_dump(ServerProgsDB, argv(2));
-                                       print("DB dumped.\n"); // wtf does this do?
-                                       return;
-                               }
-                               else if(argv(1) == "load")
-                               {
-                                       db_close(ServerProgsDB);
-                                       ServerProgsDB = db_load(argv(2));
-                                       print(strcat("Loaded '", argv(2), "' as new serverprogs database.\n"));
-                                       return;
-                               }
-                       }
-               }
-                       
-               default:
-                       print("Incorrect parameters for ^2database^7\n");
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd database action filename\n");
-                       print("  Where 'action' is the command to complete,\n");
-                       print("  and 'filename' is what it acts upon.\n");
-                       print("  Full list of commands here: \"save, dump, load.\"\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_defer_clear(float request, float argc)
-{      
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       entity client;
-                       float entno = stof(argv(1));
-                       
-                       if(argc == 2)
-                       {
-                               // player_id is out of range
-                               if((entno < 1) | (entno > maxclients)) {
-                                       print("Player ", argv(1), " doesn't exist\n");
-                                       return;
-                               }
-                               client = edict_num(entno);
-                               if not(client.flags & FL_CLIENT) {
-                                       print("Player ", argv(1), " doesn't exist\n");
-                                       return;
-                               }
-                               if(clienttype(client) == CLIENTTYPE_BOT) {
-                                       print("Player ", argv(1), " (", client.netname, ") is a bot\n");
-                                       return;
-                               }
-                               stuffcmd(client, "defer clear\n");
-                               print("defer clear stuffed to ", argv(1), " (", client.netname, ")\n");
-                               return;
-                       }
-               }
-               
-               default:
-                       print("Incorrect parameters for ^2defer_clear^7\n");
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd defer_clear clientnumber\n");
-                       print("  where 'clientnumber' is player entity number.\n");
-                       print("See also: ^2defer_clear_all^7\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_defer_clear_all(float request)
-{      
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       entity client;
-                       float i;
-                       float argc;
-                       
-                       FOR_EACH_CLIENT(client)
-                       {
-                               argc = tokenize_console(strcat("defer_clear ", ftos(num_for_edict(client))));
-                               GameCommand_defer_clear(GC_REQUEST_COMMAND, argc);      
-                               ++i;
-                       }
-                       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;
-               }
-               
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd defer_clear_all\n");
-                       print("  No arguments required.\n");
-                       print("See also: ^2defer_clear^7\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_delrec(float request, float argc) // UNTESTED // perhaps merge later with records and printstats and such?
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       if(argv(1))
-                       {
-                               if(argv(2))
-                                       race_deleteTime(argv(2), stof(argv(1)));
-                               else
-                                       race_deleteTime(GetMapname(), stof(argv(1)));
-                               return;
-                       }
-               }       
-               
-               default:
-                       print("Incorrect parameters for ^2delrec^7\n");
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd delrec ranking [map]\n");
-                       print("  'ranking' is which ranking level to clear up to, \n");
-                       print("  it will clear all records up to nth place.\n");
-                       print("  if 'map' is not provided it will use current map.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_effectindexdump(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       float fh, d;
-                       string s;
-                       
-                       d = db_create();
-                       print("begin of effects list\n");
-                       db_put(d, "TE_GUNSHOT", "1"); print("effect TE_GUNSHOT is ", ftos(particleeffectnum("TE_GUNSHOT")), "\n");
-                       db_put(d, "TE_GUNSHOTQUAD", "1"); print("effect TE_GUNSHOTQUAD is ", ftos(particleeffectnum("TE_GUNSHOTQUAD")), "\n");
-                       db_put(d, "TE_SPIKE", "1"); print("effect TE_SPIKE is ", ftos(particleeffectnum("TE_SPIKE")), "\n");
-                       db_put(d, "TE_SPIKEQUAD", "1"); print("effect TE_SPIKEQUAD is ", ftos(particleeffectnum("TE_SPIKEQUAD")), "\n");
-                       db_put(d, "TE_SUPERSPIKE", "1"); print("effect TE_SUPERSPIKE is ", ftos(particleeffectnum("TE_SUPERSPIKE")), "\n");
-                       db_put(d, "TE_SUPERSPIKEQUAD", "1"); print("effect TE_SUPERSPIKEQUAD is ", ftos(particleeffectnum("TE_SUPERSPIKEQUAD")), "\n");
-                       db_put(d, "TE_WIZSPIKE", "1"); print("effect TE_WIZSPIKE is ", ftos(particleeffectnum("TE_WIZSPIKE")), "\n");
-                       db_put(d, "TE_KNIGHTSPIKE", "1"); print("effect TE_KNIGHTSPIKE is ", ftos(particleeffectnum("TE_KNIGHTSPIKE")), "\n");
-                       db_put(d, "TE_EXPLOSION", "1"); print("effect TE_EXPLOSION is ", ftos(particleeffectnum("TE_EXPLOSION")), "\n");
-                       db_put(d, "TE_EXPLOSIONQUAD", "1"); print("effect TE_EXPLOSIONQUAD is ", ftos(particleeffectnum("TE_EXPLOSIONQUAD")), "\n");
-                       db_put(d, "TE_TAREXPLOSION", "1"); print("effect TE_TAREXPLOSION is ", ftos(particleeffectnum("TE_TAREXPLOSION")), "\n");
-                       db_put(d, "TE_TELEPORT", "1"); print("effect TE_TELEPORT is ", ftos(particleeffectnum("TE_TELEPORT")), "\n");
-                       db_put(d, "TE_LAVASPLASH", "1"); print("effect TE_LAVASPLASH is ", ftos(particleeffectnum("TE_LAVASPLASH")), "\n");
-                       db_put(d, "TE_SMALLFLASH", "1"); print("effect TE_SMALLFLASH is ", ftos(particleeffectnum("TE_SMALLFLASH")), "\n");
-                       db_put(d, "TE_FLAMEJET", "1"); print("effect TE_FLAMEJET is ", ftos(particleeffectnum("TE_FLAMEJET")), "\n");
-                       db_put(d, "EF_FLAME", "1"); print("effect EF_FLAME is ", ftos(particleeffectnum("EF_FLAME")), "\n");
-                       db_put(d, "TE_BLOOD", "1"); print("effect TE_BLOOD is ", ftos(particleeffectnum("TE_BLOOD")), "\n");
-                       db_put(d, "TE_SPARK", "1"); print("effect TE_SPARK is ", ftos(particleeffectnum("TE_SPARK")), "\n");
-                       db_put(d, "TE_PLASMABURN", "1"); print("effect TE_PLASMABURN is ", ftos(particleeffectnum("TE_PLASMABURN")), "\n");
-                       db_put(d, "TE_TEI_G3", "1"); print("effect TE_TEI_G3 is ", ftos(particleeffectnum("TE_TEI_G3")), "\n");
-                       db_put(d, "TE_TEI_SMOKE", "1"); print("effect TE_TEI_SMOKE is ", ftos(particleeffectnum("TE_TEI_SMOKE")), "\n");
-                       db_put(d, "TE_TEI_BIGEXPLOSION", "1"); print("effect TE_TEI_BIGEXPLOSION is ", ftos(particleeffectnum("TE_TEI_BIGEXPLOSION")), "\n");
-                       db_put(d, "TE_TEI_PLASMAHIT", "1"); print("effect TE_TEI_PLASMAHIT is ", ftos(particleeffectnum("TE_TEI_PLASMAHIT")), "\n");
-                       db_put(d, "EF_STARDUST", "1"); print("effect EF_STARDUST is ", ftos(particleeffectnum("EF_STARDUST")), "\n");
-                       db_put(d, "TR_ROCKET", "1"); print("effect TR_ROCKET is ", ftos(particleeffectnum("TR_ROCKET")), "\n");
-                       db_put(d, "TR_GRENADE", "1"); print("effect TR_GRENADE is ", ftos(particleeffectnum("TR_GRENADE")), "\n");
-                       db_put(d, "TR_BLOOD", "1"); print("effect TR_BLOOD is ", ftos(particleeffectnum("TR_BLOOD")), "\n");
-                       db_put(d, "TR_WIZSPIKE", "1"); print("effect TR_WIZSPIKE is ", ftos(particleeffectnum("TR_WIZSPIKE")), "\n");
-                       db_put(d, "TR_SLIGHTBLOOD", "1"); print("effect TR_SLIGHTBLOOD is ", ftos(particleeffectnum("TR_SLIGHTBLOOD")), "\n");
-                       db_put(d, "TR_KNIGHTSPIKE", "1"); print("effect TR_KNIGHTSPIKE is ", ftos(particleeffectnum("TR_KNIGHTSPIKE")), "\n");
-                       db_put(d, "TR_VORESPIKE", "1"); print("effect TR_VORESPIKE is ", ftos(particleeffectnum("TR_VORESPIKE")), "\n");
-                       db_put(d, "TR_NEHAHRASMOKE", "1"); print("effect TR_NEHAHRASMOKE is ", ftos(particleeffectnum("TR_NEHAHRASMOKE")), "\n");
-                       db_put(d, "TR_NEXUIZPLASMA", "1"); print("effect TR_NEXUIZPLASMA is ", ftos(particleeffectnum("TR_NEXUIZPLASMA")), "\n");
-                       db_put(d, "TR_GLOWTRAIL", "1"); print("effect TR_GLOWTRAIL is ", ftos(particleeffectnum("TR_GLOWTRAIL")), "\n");
-                       db_put(d, "TR_SEEKER", "1"); print("effect TR_SEEKER is ", ftos(particleeffectnum("TR_SEEKER")), "\n");
-                       db_put(d, "SVC_PARTICLE", "1"); print("effect SVC_PARTICLE is ", ftos(particleeffectnum("SVC_PARTICLE")), "\n");
-
-                       fh = fopen("effectinfo.txt", FILE_READ);
-                       while((s = fgets(fh)))
-                       {
-                               tokenize_console(s);
-                               if(argv(0) == "effect")
-                               {
-                                       if(db_get(d, argv(1)) != "1")
-                                       {
-                                               if(particleeffectnum(argv(1)) >= 0)
-                                                       print("effect ", argv(1), " is ", ftos(particleeffectnum(argv(1))), "\n");
-                                               db_put(d, argv(1), "1");
-                                       }
-                               }
-                       }
-                       print("end of effects list\n");
-
-                       db_close(d);
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd effectindexdump\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_extendmatchtime(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       changematchtime(autocvar_timelimit_increment* 60, autocvar_timelimit_min*60, autocvar_timelimit_max*60);
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd extendmatchtime\n");
-                       print("  No arguments required.\n");
-                       print("See also: ^2reducematchtime^7\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_find(float request, float argc)
-{      
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       entity client;
-                       
-                       for(client = world; (client = find(client, classname, argv(1))); )
-                               print(etos(client), "\n");
-                               
-                       return;
-               }
-                       
-               default:
-                       print("Incorrect parameters for ^2find^7\n");
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd find classname\n");
-                       print("  Where 'classname' is the classname to search for.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_gametype(float request, float argc)
-{      
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       string s = argv(1);
-                       float t = MapInfo_Type_FromString(s), tsave = MapInfo_CurrentGametype();
-                       
-                       if(t)
-                       {
-                               MapInfo_SwitchGameType(t);
-                               MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0);
-                               if(MapInfo_count > 0)
-                                       bprint("Game type successfully switched to ", s, "\n");
-                               else
-                               {
-                                       bprint("Cannot use this game type: no map for it found\n");
-                                       MapInfo_SwitchGameType(tsave);
-                                       MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0);
-                               }
-                       }
-                       else
-                               bprint("Game type switch to ", s, " failed: this type does not exist!\n");
-                       return;
-               }
-                       
-               default:
-                       print("Incorrect parameters for ^2gametype^7\n");
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd gametype mode\n");
-                       print("  Where 'mode' is the gametype mode to switch to.\n");
-                       print("See also: ^2gotomap^7\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_gettaginfo(float request, float argc) // UNTESTED // todo: finish usage description for it (but, must first learn this shit)
-{      
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       entity tmp_entity;
-                       float i;
-                       vector v;
-                       
-                       if(argc >= 4)
-                       {
-                               tmp_entity = spawn();
-                               if(argv(1) == "w")
-                                       setmodel(tmp_entity, (nextent(world)).weaponentity.model);
-                               else
-                               {
-                                       precache_model(argv(1));
-                                       setmodel(tmp_entity, argv(1));
-                               }
-                               tmp_entity.frame = stof(argv(2));
-                               if(substring(argv(3), 0, 1) == "#")
-                                       i = stof(substring(argv(3), 1, -1));
-                               else
-                                       i = gettagindex(tmp_entity, argv(3));
-                               if(i)
-                               {
-                                       v = gettaginfo(tmp_entity, i);
-                                       print("model ", tmp_entity.model, " frame ", ftos(tmp_entity.frame), " tag ", gettaginfo_name);
-                                       print(" index ", ftos(i), " parent ", ftos(gettaginfo_parent), "\n");
-                                       print(" vector = ", ftos(v_x), " ", ftos(v_y), " ", ftos(v_z), "\n");
-                                       print(" offset = ", ftos(gettaginfo_offset_x), " ", ftos(gettaginfo_offset_y), " ", ftos(gettaginfo_offset_z), "\n");
-                                       print(" forward = ", ftos(gettaginfo_forward_x), " ", ftos(gettaginfo_forward_y), " ", ftos(gettaginfo_forward_z), "\n");
-                                       print(" right = ", ftos(gettaginfo_right_x), " ", ftos(gettaginfo_right_y), " ", ftos(gettaginfo_right_z), "\n");
-                                       print(" up = ", ftos(gettaginfo_up_x), " ", ftos(gettaginfo_up_y), " ", ftos(gettaginfo_up_z), "\n");
-                                       if(argc >= 6)
-                                       {
-                                               v_y = -v_y;
-                                               localcmd(strcat(argv(4), vtos(v), argv(5), "\n"));
-                                       }
-                               }
-                               else
-                                       print("bone not found\n");
-                                       
-                               remove(tmp_entity);
-                               return;
-                       }
-               }
-                       
-               default:
-                       print("Incorrect parameters for ^2gettaginfo^7\n");
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd gettaginfo\n");
-                       print("  FIXME: Arguments currently unknown\n");
-                       print("See also: ^2bbox^7\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_gotomap(float request, float argc)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       if(argc == 2)
-                       {
-                               print(GotoMap(argv(1)), "\n");
-                               return;
-                       }
-               }
-                       
-               default:
-                       print("Incorrect parameters for ^2gotomap^7\n");
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd gotomap map\n");
-                       print("  Where 'map' is the *.bsp file to change to.\n");
-                       print("See also: ^2gametype^7\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_ladder(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       print(ladder_reply);
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd ladder\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_lockteams(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       if(teamplay)
-                       {
-                               lockteams = 1;
-                               bprint("^1The teams are now locked.\n");
-                       }
-                       else
-                       {
-                               bprint("lockteams command can only be used in a team-based gamemode.\n");
-                       }
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd lockteams\n");
-                       print("  No arguments required.\n");
-                       print("See also: ^2unlockteams^7\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_make_mapinfo(float request) // UNTESTED
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               { 
-                       entity tmp_entity;
-                       
-                       tmp_entity = spawn();
-                       tmp_entity.classname = "make_mapinfo";
-                       tmp_entity.think = make_mapinfo_Think;
-                       tmp_entity.nextthink = time; // this sucks... todo: re-write this -- Use initializeentity later
-                       MapInfo_Enumerate();
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd make_mapinfo\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_modelbug(float request) // UNTESTED // is this even needed anymore? 
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       modelbug();
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd modelbug\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_moveplayer(float request, float argc)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       entity client;
-       
-                       string targets = strreplace(",", " ", argv(1));
-                       string original_targets = strreplace(" ", ", ", targets);
-                       string destination = argv(2);
-                       string notify = argv(3);
-                       
-                       string successful, t;
-                       
-                       // lets see if the target(s) even actually exist.
-                       if((targets) && (destination))
-                       { 
-                               for(;targets;)
-                               {
-                                       t = car(targets); targets = cdr(targets);
-
-                                       // Check to see if the player is a valid target
-                                       if((GetFilteredNumber(t) < 1) || (GetFilteredNumber(t) > maxclients)) // player_id is out of range
-                                       {
-                                               print("Player ", ftos(GetFilteredNumber(t)), " doesn't exist (out of range)", (targets ? ", skipping to next player.\n" : ".\n"));
-                                               continue; 
-                                       }
-                                       client = edict_num(GetFilteredNumber(t));
-                                       if not(client.flags & FL_CLIENT) // player entity is not a client
-                                       {
-                                               print("Player ", ftos(GetFilteredNumber(t)), " doesn't exist (not a client)", (targets ? ", skipping to next player.\n" : ".\n"));
-                                               continue;
-                                       }
-                                       
-                                       // Where are we putting this player?
-                                       if(destination == "spec" || destination == "spectator") 
-                                       {
-                                               if(client.classname != "spectator" && client.classname != "observer")
-                                               {
-                                                       self = client;
-                                                       PutObserverInServer();
-                                                       
-                                                       successful = strcat(successful, (successful ? ", " : ""), client.netname);
-                                               }
-                                               else
-                                               {
-                                                       print("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") is already spectating.\n");
-                                               }
-                                               continue;
-                                       }
-                                       else
-                                       {
-                                               if(client.classname != "spectator" && client.classname != "observer")
-                                               {
-                                                       if(teamplay)
-                                                       {
-                                                               // set up
-                                                               float team_color;
-                                                               float save = client.team_forced;
-                                                               client.team_forced = 0;
-
-                                                               // find the team to move the player to
-                                                               team_color = ColourToNumber(destination);
-                                                               if(team_color == client.team) // already on the destination team
-                                                               {
-                                                                       // keep the forcing undone
-                                                                       print("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") is already on the ", ColoredTeamName(client.team), (targets ? ", skipping to next player.\n" : ".\n"));
-                                                                       continue;
-                                                               } 
-                                                               else if(team_color == 0)  // auto team
-                                                               {
-                                                                       team_color = NumberToTeamNumber(FindSmallestTeam(client, FALSE));
-                                                               }
-                                                               else
-                                                               {
-                                                                       CheckAllowedTeams(client);
-                                                               }
-                                                               client.team_forced = save;
-                                                               
-                                                               // Check to see if the destination team is even available
-                                                               switch(team_color) 
-                                                               {
-                                                                       case COLOR_TEAM1: if(c1 == -1) { print("Sorry, can't move player to red team if it doesn't exist.\n"); return; } break;
-                                                                       case COLOR_TEAM2: if(c2 == -1) { print("Sorry, can't move player to blue team if it doesn't exist.\n"); return; } break;
-                                                                       case COLOR_TEAM3: if(c3 == -1) { print("Sorry, can't move player to yellow team if it doesn't exist.\n"); return; } break;
-                                                                       case COLOR_TEAM4: if(c4 == -1) { print("Sorry, can't move player to pink team if it doesn't exist.\n"); return; } break;
-                                                                       
-                                                                       default: print("Sorry, can't move player here if team ", destination, " doesn't exist.\n"); return;
-                                                               }
-                                                               
-                                                               // If so, lets continue and finally move the player
-                                                               client.team_forced = 0;
-                                                               MoveToTeam(client, team_color, 6, stof(notify));
-                                                               successful = strcat(successful, (successful ? ", " : ""), client.netname);
-                                                               print("Player ", ftos(GetFilteredNumber(t)), " (", client.netname, ") has been moved to the ", ColoredTeamName(team_color), ".\n");
-                                                               continue;
-                                                       }
-                                                       else
-                                                       {
-                                                               print("Can't change teams when currently not playing a team game.\n");
-                                                               return;
-                                                       }
-                                               }
-                                               else
-                                               {
-                                                       print("Can't change teams if the player isn't in the game.\n"); // well technically we could, but should we allow that? :P 
-                                                       return;
-                                               }
-                                       }
-                               }
-                               
-                               if(successful)
-                                       bprint("Successfully moved players ", successful, " to destination ", destination, ".\n");
-                               else
-                                       print("No players given (", original_targets, ") are able to move.\n");
-                                       
-                               return; // still correct parameters so return to avoid usage print
-                       }
-               }
-                       
-               default:
-                       print("Incorrect parameters for ^2moveplayer^7\n");
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd moveplayer clientnumbers destination [notify]\n");
-                       print("  'clientnumbers' is a list (separated by commas) of player entity ID's\n");
-                       print("  'destination' is what to send the player to, be it team or spectating\n");
-                       print("  Full list of destinations here: \"spec, spectator, red, blue, yellow, pink, auto.\"\n");
-                       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("See also: ^2allspec, shuffleteams^7\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_nospectators(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       blockSpectators = 1;
-                       entity plr;
-                       FOR_EACH_CLIENT(plr) //give every spectator <g_maxplayers_spectator_blocktime> seconds time to become a player
-                       {
-                               if(plr.classname == "spectator" || plr.classname == "observer")
-                               {
-                                       plr.spectatortime = time;
-                                       sprint(plr, strcat("^7You have to become a player within the next ", ftos(autocvar_g_maxplayers_spectator_blocktime), " seconds, otherwise you will be kicked, because spectators aren't allowed at this time!\n"));
-                               }
-                       }
-                       bprint(strcat("^7All spectators will be automatically kicked when not joining the game after ", ftos(autocvar_g_maxplayers_spectator_blocktime), " seconds!\n"));
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd nospectators\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_onslaught_updatelinks(float request) // UNTESTED // should this be here? Perhaps some mutatorhook call instead....
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       onslaught_updatelinks();
-                       print("ONS links updated\n");
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd onslaught_updatelinks\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_playerdemo(float request, float argc) // UNTESTED
-{      
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       entity client;
-                       float i, n, entno;
-                       string s;
-                       
-                       switch(argv(1))
-                       {
-                               case "read":
-                               {
-                                       // 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");
-                                               return;
-                                       }
-                                       client = edict_num(entno);
-                                       if(clienttype(client) != CLIENTTYPE_BOT) {
-                                               print("Player ", client.netname, " is not a bot\n");
-                                               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");
-                                               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");
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd \n");
-                       print("  FIXME: Arguments currently unknown\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_printstats(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       DumpStats(FALSE);
-                       print("stats dumped.\n");
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd printstats\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_radarmap(float request, float argc)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       if(RadarMap_Make(argc))
-                               return;
-               }
-                       
-               default:
-                       print("Incorrect parameters for ^2radarmap^7\n");
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd radarmap [--force] [--loop] [--quit] [--block | --trace | --sample | --lineblock] [--sharpen N] [--res W H] [--qual Q]\n");
-                       print("  The quality factor Q is roughly proportional to the time taken.\n");
-                       print("  trace supports no quality factor; its result should look like --block with infinite quality factor.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_rankings(float request) // this is OLD.... jeez.
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       strunzone(rankings_reply);
-                       rankings_reply = strzone(getrankings());
-                       print(rankings_reply);
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd rankings\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_records(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       float i;
-                       
-                       for (i = 0; i < 10; ++i)
-                               print(records_reply[i]);
-                               
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd records\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_reducematchtime(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       changematchtime(autocvar_timelimit_decrement*-60, autocvar_timelimit_min*60, autocvar_timelimit_max*60);
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd reducematchtime\n");
-                       print("  No arguments required.\n");
-                       print("See also: ^2extendmatchtime^7\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_setbots(float request, float argc)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       if(argc >= 2)
-                       {
-                               cvar_settemp("minplayers", "0");
-                               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");
-                       print("  Where 'botnumber' is the amount of bots to set bot_number cvar to.\n");
-                       print("See also: ^2bot_cmd^7\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_shuffleteams(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       if(teamplay)
-                       {
-                               entity tmp_player;
-                               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)
-                               {
-                                       CheckAllowedTeams(tmp_player);
-                                       
-                                       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
-                               FOR_EACH_PLAYER(tmp_player)
-                               {
-                                       for(;;)
-                                       {
-                                               i = bound(1, floor(random() * maxclients) + 1, maxclients);
-                                               
-                                               if(shuffleteams_players[i])
-                                               {
-                                                       continue; // a player is already assigned to this slot
-                                               }
-                                               else
-                                               {
-                                                       shuffleteams_players[i] = num_for_edict(tmp_player);
-                                                       break;
-                                               }
-                                       }
-                               }
-
-                               // finally, from the list made earlier, re-join the players in different order. 
-                               for(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 = NumberToTeamNumber(i);
-                                       
-                                       // sort through the random list of players made earlier 
-                                       for(z = 1; z <= maxclients; ++z)
-                                       {                                                       
-                                               if not(shuffleteams_teams[i] >= x)
-                                               {
-                                                       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
-                                               }
-                                       }
-                               }
-                               
-                               bprint("Successfully shuffled the players around randomly.\n");
-                               
-                               // clear the buffers now
-                               for (i=0; i<SHUFFLETEAMS_MAX_PLAYERS; ++i)
-                                       shuffleteams_players[i] = 0;
-                               
-                               for (i=0; i<SHUFFLETEAMS_MAX_TEAMS; ++i)
-                                       shuffleteams_teams[i] = 0;
-                       }
-                       else
-                       {
-                               print("Can't shuffle teams when currently not playing a team game.\n");
-                       }
-                       
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd shuffleteams\n");
-                       print("  No arguments required.\n");
-                       print("See also: ^2moveplayer, allspec^7\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_stuffto(float request, float argc)
-{
-       // This... is a fairly dangerous and powerful command... - It allows any arguments to be sent to a client via rcon.
-       // Because of this, it is disabled by default and must be enabled by the server owner when doing compilation. That way,
-       // we can be certain they understand the risks of it... So to enable, compile server with -DSTUFFTO_ENABLED argument.
-       
-       #ifdef STUFFTO_ENABLED
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       entity client;
-                       float entno;
-                       
-                       if(argc == 3)
-                       {
-                               entno = GetFilteredNumber(argv(1));
-                               client = world;
-                               if(entno <= maxclients)
-                                       client = edict_num(entno);
-                               if(client.flags & FL_CLIENT)
-                               {
-                                       stuffcmd(client, strcat("\n", argv(2), "\n"));
-                                       print(strcat("Command: \"", argv(2), "\" sent to ", client.netname, " (", argv(1) ,").\n"));
-                               }
-                               else
-                                       print(strcat("Client (", argv(1) ,") not found.\n"));
-                               
-                               return;
-                       }
-               }
-                       
-               default:
-                       print("Incorrect parameters for ^2stuffto^7\n");
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd stuffto clientnumber command\n");
-                       print("  FIXME: Arguments currently unknown\n");
-                       return;
-               }
-       }
-       #else
-       if(request)
-       {
-               print("stuffto command is not enabled on this server.\n");
-               return;
-       }
-       #endif
-}
-
-void GameCommand_teamstatus(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       Score_NicePrint(world);
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd teamstatus\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_time(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       print("time = ", ftos(time), "\n");
-                       print("frame start = ", ftos(gettime(GETTIME_FRAMESTART)), "\n");
-                       print("realtime = ", ftos(gettime(GETTIME_REALTIME)), "\n");
-                       print("hires = ", ftos(gettime(GETTIME_HIRES)), "\n");
-                       print("uptime = ", ftos(gettime(GETTIME_UPTIME)), "\n");
-                       print("localtime = ", strftime(TRUE, "%a %b %e %H:%M:%S %Z %Y"), "\n"); // FIXME: Why is strftime broken? is engine problem, I think.
-                       print("gmtime = ", strftime(FALSE, "%a %b %e %H:%M:%S %Z %Y"), "\n");
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd time\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_trace(float request, float argc)
-{                                              
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       // TODO: Clean up all of these variables and merge the code below to use only a few
-                       entity e;
-                       vector org, delta, start, end, p, q, q0, pos, vv, dv;
-                       float i, f, safe, unsafe, dq, dqf;
-       
-                       switch(argv(1))
-                       {
-                               case "debug":
-                               {
-                                       print("TEST CASE. If this returns the runaway loop counter error, possibly everything is oaky.\n");
-                                       for(;;)
-                                       {
-                                               org = world.mins;
-                                               delta = world.maxs - world.mins;
-
-                                               start_x = org_x + random() * delta_x;
-                                               start_y = org_y + random() * delta_y;
-                                               start_z = org_z + random() * delta_z;
-
-                                               end_x = org_x + random() * delta_x;
-                                               end_y = org_y + random() * delta_y;
-                                               end_z = org_z + random() * delta_z;
-
-                                               start = stov(vtos(start));
-                                               end = stov(vtos(end));
-
-                                               tracebox(start, PL_MIN, PL_MAX, end, MOVE_NOMONSTERS, world);
-                                               if(!trace_startsolid)
-                                               {
-                                                       p = trace_endpos;
-                                                       tracebox(p, PL_MIN, PL_MAX, p, MOVE_NOMONSTERS, world);
-                                                       if(trace_startsolid || trace_fraction == 1)
-                                                       {
-                                                               rint(42); // do an engine breakpoint on VM_rint so you can get the trace that errnoeously returns startsolid
-                                                               tracebox(start, PL_MIN, PL_MAX, end, MOVE_NOMONSTERS, world);
-                                                               tracebox(p, PL_MIN, PL_MAX, q, MOVE_NOMONSTERS, world);
-
-                                                               if(trace_startsolid)
-                                                               {
-                                                                       // how much do we need to back off?
-                                                                       safe = 1;
-                                                                       unsafe = 0;
-                                                                       for(;;)
-                                                                       {
-                                                                               pos = p * (1 - (safe + unsafe) * 0.5) + start * ((safe + unsafe) * 0.5);
-                                                                               tracebox(pos, PL_MIN, PL_MAX, pos, MOVE_NOMONSTERS, world);
-                                                                               if(trace_startsolid)
-                                                                               {
-                                                                                       if((safe + unsafe) * 0.5 == unsafe)
-                                                                                               break;
-                                                                                       unsafe = (safe + unsafe) * 0.5;
-                                                                               }
-                                                                               else
-                                                                               {
-                                                                                       if((safe + unsafe) * 0.5 == safe)
-                                                                                               break;
-                                                                                       safe = (safe + unsafe) * 0.5;
-                                                                               }
-                                                                       }
-
-                                                                       print("safe distance to back off: ", ftos(safe * vlen(p - start)), "qu\n");
-                                                                       print("unsafe distance to back off: ", ftos(unsafe * vlen(p - start)), "qu\n");
-
-                                                                       tracebox(p, PL_MIN + '0.1 0.1 0.1', PL_MAX - '0.1 0.1 0.1', p, MOVE_NOMONSTERS, world);
-                                                                       if(trace_startsolid)
-                                                                               print("trace_endpos much in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n");
-                                                                       else
-                                                                               print("trace_endpos just in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n");
-                                                                       break;
-                                                               }
-
-                                                               q0 = p;
-                                                               dq = 0;
-                                                               dqf = 1;
-                                                               for(;;)
-                                                               {
-                                                                       q = p + normalize(end - p) * (dq + dqf);
-                                                                       if(q == q0)
-                                                                               break;
-                                                                       tracebox(p, PL_MIN, PL_MAX, q, MOVE_NOMONSTERS, world);
-                                                                       if(trace_startsolid)
-                                                                               error("THIS ONE cannot happen");
-                                                                       if(trace_fraction > 0)
-                                                                               dq += dqf * trace_fraction;
-                                                                       dqf *= 0.5;
-                                                                       q0 = q;
-                                                               }
-                                                               if(dq > 0)
-                                                               {
-                                                                       print("trace_endpos still before solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n");
-                                                                       print("could go ", ftos(dq), " units further to ", vtos(q), "\n");
-                                                                       break;
-                                                               }
-                                                       }
-                                               }
-                                       }
-                                       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;
-                                       if(trace_fraction == 1)
-                                       {
-                                               print("not above ground, aborting\n");
-                                               return;
-                                       }
-                                       f = 0;
-                                       for(i = 0; i < 100000; ++i)
-                                       {
-                                               dv = randomvec();
-                                               if(dv_z > 0)
-                                                       dv = -1 * dv;
-                                               tracebox(vv, e.mins, e.maxs, vv + dv, MOVE_NORMAL, e);
-                                               if(trace_startsolid)
-                                                       print("bug 1\n");
-                                               if(trace_fraction == 1)
-                                               if(dv_z < f)
-                                               {
-                                                       print("bug 2: ", ftos(dv_x), " ", ftos(dv_y), " ", ftos(dv_z));
-                                                       print(" (", ftos(asin(dv_z / vlen(dv)) * 180 / M_PI), " degrees)\n");
-                                                       f = dv_z;
-                                               }
-                                       }
-                                       print("highest possible dist: ", ftos(f), "\n");
-                                       return;
-                               }
-                               
-                               case "walk":
-                               {
-                                       if(argc == 3)
-                                       {
-                                               e = nextent(world);
-                                               if(tracewalk(e, stov(argv(1)), e.mins, e.maxs, stov(argv(2)), MOVE_NORMAL))
-                                                       print("can walk\n");
-                                               else
-                                                       print("cannot walk\n");
-                                               return;
-                                       }
-                               }
-                               
-                               case "showline":
-                               {
-                                       if(argc == 3)
-                                       {
-                                               vv = stov(argv(1));
-                                               dv = stov(argv(2));
-                                               traceline(vv, dv, MOVE_NORMAL, world);
-                                               trailparticles(world, particleeffectnum("TR_NEXUIZPLASMA"), vv, trace_endpos);
-                                               trailparticles(world, particleeffectnum("TR_CRYLINKPLASMA"), trace_endpos, dv);
-                                               return;
-                                       }
-                               }
-                               
-                               // 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");
-                       print("  FIXME: Arguments currently unknown\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_unlockteams(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       if(teamplay)
-                       {
-                               lockteams = 0;
-                               bprint("^1The teams are now unlocked.\n");
-                       }
-                       else
-                       {
-                               bprint("unlockteams command can only be used in a team-based gamemode.\n");
-                       }
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd unlockteams\n");
-                       print("  No arguments required.\n");
-                       print("See also: ^2lockteams^7\n");
-                       return;
-               }
-       }
-}
-
-void GameCommand_warp(float request, float argc)
-{
-       switch (request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       if(autocvar_g_campaign)
-                       {
-                               if(argc >= 2)
-                               {
-                                       CampaignLevelWarp(stof(argv(1)));
-                                       print("Successfully warped to campaign level ", stof(argv(1)), ".\n");
-                               }       
-                               else
-                               {
-                                       CampaignLevelWarp(-1);
-                                       print("Successfully warped to next campaign level.\n");
-                               }
-                       }
-                       else
-                               print("Not in campaign, can't level warp\n");
-                       return;
-               }
-               
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd level\n");
-                       print("  'level' is the level to change campaign mode to.\n");
-                       return;
-               }
-       }
-}
-
-/* use this when creating a new command, making sure to place it in alphabetical order.
-void GameCommand_(float request)
-{
-       switch(request)
-       {
-               case GC_REQUEST_COMMAND:
-               {
-                       
-                       return;
-               }
-                       
-               default:
-               case GC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 sv_cmd \n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-*/
-
-
-// ==================================
-//  Macro system for server commands
-// ==================================
-
-// Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
-#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("anticheat", GameCommand_anticheat(request, arguments), "Create an anticheat report for a client") \
-       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", GameCommand_cvar_changes(request), "Prints a list of all changed server cvars") \
-       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("defer_clear_all", GameCommand_defer_clear_all(request), "Clear all queued defer commands for all clients") \
-       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") \
-       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("gotomap", GameCommand_gotomap(request, arguments), "Simple command to switch to another map") \
-       SERVER_COMMAND("ladder", GameCommand_ladder(request), "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("make_mapinfo", GameCommand_make_mapinfo(request), "Automatically rebuild mapinfo files") \
-       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("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") \
-       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", GameCommand_teamstatus(request), "Show information about player and team scores") \
-       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") \
-       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(0, 0, "")
-       #undef SERVER_COMMAND
-       
-       return;
-}
-
-float GameCommand_macro_command(float argc, string command)
-{
-       #define SERVER_COMMAND(name,function,description) \
-               { if(name == strtolower(argv(0))) { function; return TRUE; } }
-               
-       SERVER_COMMANDS(GC_REQUEST_COMMAND, argc, command)
-       #undef SERVER_COMMAND
-       
-       return FALSE;
-}
-
-float GameCommand_macro_usage(float argc)
-{
-       #define SERVER_COMMAND(name,function,description) \
-               { if(name == strtolower(argv(1))) { function; return TRUE; } }
-               
-       SERVER_COMMANDS(GC_REQUEST_USAGE, argc, "")
-       #undef SERVER_COMMAND
-       
-       return FALSE;
-}
-       
-
-// =========================================
-//  Main Function Called By Engine (sv_cmd)
-// =========================================
-// If this function exists, game code handles gamecommand instead of the engine code.
-
-void GameCommand(string command)
-{
-       float argc = tokenize_console(command);
-
-       if(strtolower(argv(0)) == "help") 
-       {
-               if(argc == 1) 
-               {
-                       print("\nUsage:^3 sv_cmd COMMAND...^7, where possible commands are:\n");
-                       GameCommand_macro_help();
-                       
-                       GameCommand_Ban("help");
-                       GameCommand_Generic("help");
-                       print("For help about specific commands, 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
-               {
-                       return;
-               }
-       } 
-       else if(GameCommand_Ban(command)) 
-       {
-               return; // handled by server/ipban.qc
-       }
-       else if(GameCommand_Generic(command)) 
-       {
-               return; // handled by common/gamecommand.qc
-       }
-       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("Unknown server command", ((command != "") ? strcat(" \"", command, "\"") : ""), ". For a list of supported commands, try sv_cmd help.\n");
-       
-       return;
-}
\ No newline at end of file
diff --git a/qcsrc/server/vote.qc b/qcsrc/server/vote.qc
deleted file mode 100644 (file)
index 2ed9f4f..0000000
+++ /dev/null
@@ -1,1056 +0,0 @@
-// =============================================
-//  Server side voting code, reworked by Samual
-//  Last updated: December 10th, 2011
-// =============================================
-
-#define VC_REQUEST_COMMAND 1
-#define VC_REQUEST_USAGE 2
-
-#define VC_ASGNMNT_BOTH 1
-#define VC_ASGNMNT_CLIENTONLY 2
-#define VC_ASGNMNT_SERVERONLY 3
-
-#define VOTE_SELECT_ABSTAIN -2
-#define VOTE_SELECT_REJECT -1
-#define VOTE_SELECT_NULL 0
-#define VOTE_SELECT_ACCEPT 1
-
-string vote_parsed_command;
-string vote_parsed_display;
-
-
-// =============================================
-//  Nagger for players to know status of voting
-// =============================================
-
-float Nagger_SendEntity(entity to, float sendflags)
-{
-       float nags, i, f, b;
-       entity e;
-       WriteByte(MSG_ENTITY, ENT_CLIENT_NAGGER);
-
-       // bits:
-       //   1 = ready
-       //   2 = player needs to ready up
-       //   4 = vote
-       //   8 = player needs to vote
-       //  16 = warmup
-       // sendflags:
-       //  64 = vote counts
-       // 128 = vote string
-
-       nags = 0;
-       if(readycount)
-       {
-               nags |= 1;
-               if(to.ready == 0)
-                       nags |= 2;
-       }
-       if(votecalled)
-       {
-               nags |= 4;
-               if(to.vote_selection == 0)
-                       nags |= 8;
-       }
-       if(inWarmupStage)
-               nags |= 16;
-
-       if(sendflags & 64)
-               nags |= 64;
-
-       if(sendflags & 128)
-               nags |= 128;
-
-       if(!(nags & 4)) // no vote called? send no string
-               nags &~= (64 | 128);
-
-       WriteByte(MSG_ENTITY, nags);
-
-       if(nags & 64)
-       {
-               WriteByte(MSG_ENTITY, vote_accept_count);
-               WriteByte(MSG_ENTITY, vote_reject_count);
-               WriteByte(MSG_ENTITY, vote_needed_overall);
-               WriteChar(MSG_ENTITY, to.vote_selection);
-       }
-
-       if(nags & 128)
-               WriteString(MSG_ENTITY, votecalledvote_display);
-
-       if(nags & 1)
-       {
-               for(i = 1; i <= maxclients; i += 8)
-               {
-                       for(f = 0, e = edict_num(i), b = 1; b < 256; b *= 2, e = nextent(e))
-                               if(clienttype(e) != CLIENTTYPE_REAL || e.ready)
-                                       f |= b;
-                       WriteByte(MSG_ENTITY, f);
-               }
-       }
-
-       return TRUE;
-}
-
-void Nagger_Init()
-{
-       Net_LinkEntity(nagger = spawn(), FALSE, 0, Nagger_SendEntity);
-}
-
-void Nagger_VoteChanged()
-{
-       if(nagger)
-               nagger.SendFlags |= 128;
-}
-
-void Nagger_VoteCountChanged()
-{
-       if(nagger)
-               nagger.SendFlags |= 64;
-}
-
-void Nagger_ReadyCounted()
-{
-       if(nagger)
-               nagger.SendFlags |= 1;
-}
-
-
-// =======================
-//  Game logic for voting
-// =======================
-
-void VoteReset() 
-{
-       entity tmp_player;
-
-       FOR_EACH_CLIENT(tmp_player) { tmp_player.vote_selection = 0; }
-
-       if(votecalled)
-       {
-               strunzone(votecalledvote);
-               strunzone(votecalledvote_display);
-       }
-
-       votecalled = FALSE;
-       votecalledmaster = FALSE;
-       votefinished = 0;
-       votecalledvote = string_null;
-       votecalledvote_display = string_null;
-       
-       vote_parsed_command = string_null;
-       vote_parsed_display = string_null;
-
-       Nagger_VoteChanged();
-}
-
-void VoteStop(entity stopper) 
-{
-       bprint("\{1}^2* ^3", VoteCommand_getname(stopper), "^2 stopped ^3", VoteCommand_getname(votecaller), "^2's vote\n");
-       if(autocvar_sv_eventlog) { GameLogEcho(strcat(":vote:vstop:", ftos(stopper.playerid))); }
-       
-       // Don't force them to wait for next vote, this way they can e.g. correct their vote.
-       if((votecaller) && (stopper == votecaller)) { votecaller.vote_next = time + autocvar_sv_vote_stop; }
-
-       VoteReset();
-}
-
-void VoteThink() 
-{
-       if(votefinished > 0) // a vote was called
-       if(time > votefinished) // time is up
-       {
-               VoteCount();
-       }
-       
-       return;
-}
-
-void VoteAccept() 
-{
-       bprint("\{1}^2* ^3", VoteCommand_getname(votecaller), "^2's vote for ^1", votecalledvote_display, "^2 was accepted\n");
-       
-       if(votecalledmaster && votecaller)
-               votecaller.vote_master = 1;
-       else
-               localcmd(strcat(votecalledvote, "\n"));
-       
-       if(votecaller) { votecaller.vote_next = 0; } // people like your votes, you don't need to wait to vote again // todo separate anti-spam even for succeeded votes
-
-       VoteReset();
-       Announce("voteaccept");
-}
-
-void VoteReject() 
-{
-       bprint("\{1}^2* ^3", VoteCommand_getname(votecaller), "^2's vote for ", votecalledvote_display, "^2 was rejected\n");
-       VoteReset();
-       Announce("votefail");
-}
-
-void VoteTimeout() 
-{
-       bprint("\{1}^2* ^3", VoteCommand_getname(votecaller), "^2's vote for ", votecalledvote_display, "^2 timed out\n");
-       VoteReset();
-       Announce("votefail");
-}
-
-void VoteSpam(float notvoters, float mincount, string result)
-{
-       string s;
-       if(mincount >= 0)
-       {
-               s = strcat("\{1}^2* vote results: ^1", ftos(vote_accept_count), "^2:^1");
-               s = strcat(s, ftos(vote_reject_count), "^2 (^1");
-               s = strcat(s, ftos(mincount), "^2 needed), ^1");
-               s = strcat(s, ftos(vote_abstain_count), "^2 didn't care, ^1");
-               s = strcat(s, ftos(notvoters), "^2 didn't vote\n");
-       }
-       else
-       {
-               s = strcat("\{1}^2* vote results: ^1", ftos(vote_accept_count), "^2:^1");
-               s = strcat(s, ftos(vote_reject_count), "^2, ^1");
-               s = strcat(s, ftos(vote_abstain_count), "^2 didn't care, ^1");
-               s = strcat(s, ftos(notvoters), "^2 didn't have to vote\n");
-       }
-       
-       bprint(s);
-       
-       if(autocvar_sv_eventlog)
-       {
-               s = strcat(":vote:v", result, ":", ftos(vote_accept_count));
-               s = strcat(s, ":", ftos(vote_reject_count));
-               s = strcat(s, ":", ftos(vote_abstain_count));
-               s = strcat(s, ":", ftos(notvoters));
-               s = strcat(s, ":", ftos(mincount));
-               GameLogEcho(s);
-       }
-}
-
-void VoteCount() 
-{
-       // declarations
-       vote_accept_count = vote_reject_count = vote_abstain_count = 0;
-       
-       float spectators_allowed = ((autocvar_sv_vote_nospectators != 2) 
-                               || ((autocvar_sv_vote_nospectators == 1) && inWarmupStage) 
-                               || (autocvar_sv_vote_nospectators == 0));
-                               
-       float vote_player_count, is_player, notvoters;
-       float vote_real_player_count, vote_real_accept_count;
-       float vote_real_reject_count, vote_real_abstain_count;
-       float vote_needed_of_voted, final_needed_votes;
-       float vote_factor_overall, vote_factor_of_voted;
-       
-       entity tmp_player;
-
-       Nagger_VoteCountChanged();
-       
-       // add up all the votes from each connected client
-       FOR_EACH_REALCLIENT(tmp_player)
-       {
-               is_player = (tmp_player.classname == "player");
-               
-               ++vote_player_count;
-               if(is_player) { ++vote_real_player_count; }
-               
-               switch(tmp_player.vote_selection)
-               {
-                       case VOTE_SELECT_REJECT: { ++vote_reject_count; { if(is_player) ++vote_real_reject_count; } break; }
-                       case VOTE_SELECT_ACCEPT: { ++vote_accept_count; { if(is_player) ++vote_real_reject_count; } break; }
-                       case VOTE_SELECT_ABSTAIN: { ++vote_abstain_count; { if(is_player) ++vote_real_abstain_count; } break; }
-                       default: break;
-               }
-       }
-       
-       // Check to see if there are enough players on the server to allow master voting... otherwise, vote master could be used for evil.
-       if(votecalledmaster && autocvar_sv_vote_master_playerlimit > vote_player_count) 
-       {
-               if(votecaller) { votecaller.vote_next = 0; }
-               print_to(votecaller, "^1There are not enough players on this server to allow you to become vote master.");
-               VoteReset();
-               return;
-       }
-       
-       // if spectators aren't allowed to vote and there are players in a match, then only count the players in the vote and ignore spectators. 
-       if(!spectators_allowed && (vote_real_player_count > 0))
-       {
-               vote_accept_count = vote_real_accept_count;
-               vote_reject_count = vote_real_reject_count;
-               vote_abstain_count = vote_real_abstain_count;
-               vote_player_count = vote_real_player_count;
-       }
-       
-       // people who have no opinion in any way :D
-       notvoters = (vote_player_count - vote_accept_count - vote_reject_count - vote_abstain_count);
-
-       // determine the goal for the vote to be passed or rejected normally
-       vote_factor_overall = bound(0.5, autocvar_sv_vote_majority_factor, 0.999);
-       vote_needed_overall = floor((vote_player_count - vote_abstain_count) * vote_factor_overall) + 1;
-       
-       // if the vote times out, determine the amount of votes needed of the people who actually already voted
-       vote_factor_of_voted = bound(0.5, autocvar_sv_vote_majority_factor_of_voted, 0.999);
-       vote_needed_of_voted = floor((vote_accept_count + vote_reject_count) * vote_factor_of_voted) + 1;
-       
-       
-       // finally calculate the result of the vote     
-       if(vote_accept_count >= vote_needed_overall)
-       {
-               VoteSpam(notvoters, -1, "yes"); // there is enough acceptions to pass the vote
-               VoteAccept();
-               return;
-       }
-       
-       if(vote_reject_count > vote_player_count - vote_abstain_count - vote_needed_overall)
-       {
-               VoteSpam(notvoters, -1, "no"); // there is enough rejections to deny the vote
-               VoteReject();
-               return;
-       }
-       
-       // there is not enough votes in either direction, now lets just calculate what the voters have said
-       if(time > votefinished)
-       {
-               final_needed_votes = vote_needed_overall;
-               
-               if(autocvar_sv_vote_majority_factor_of_voted)
-               {
-                       if(vote_accept_count >= vote_needed_of_voted)
-                       {
-                               VoteSpam(notvoters, min(vote_needed_overall, vote_needed_of_voted), "yes");
-                               VoteAccept();
-                               return;
-                       }
-                       
-                       if(vote_accept_count + vote_reject_count > 0)
-                       {
-                               VoteSpam(notvoters, min(vote_needed_overall, vote_needed_of_voted), "no");
-                               VoteReject();
-                               return;
-                       }
-                       
-                       final_needed_votes = min(vote_needed_overall, vote_needed_of_voted);
-               }
-
-               // it didn't pass or fail, so not enough votes to even make a decision. 
-               VoteSpam(notvoters, final_needed_votes, "timeout");
-               VoteTimeout();
-       }
-}
-
-
-// =======================
-//  Game logic for warmup
-// =======================
-
-// Restarts the map after the countdown is over (and cvar sv_ready_restart_after_countdown is set)
-void ReadyRestart_think() 
-{
-       restart_mapalreadyrestarted = 1;
-       reset_map(TRUE);
-       Score_ClearAll();
-       remove(self);
-       
-       return;
-}
-
-// Forces a restart of the game without actually reloading the map // this is a mess...
-void ReadyRestart_force()
-{
-       entity tmp_player, restart_timer;
-
-       bprint("^1Server is restarting...\n");
-
-       VoteReset();
-
-       // clear overtime, we have to decrease timelimit to its original value again.
-       if (checkrules_overtimesadded > 0 && g_race_qualifying != 2) { cvar_set("timelimit", ftos(autocvar_timelimit - (checkrules_overtimesadded * autocvar_timelimit_overtime))); }
-
-       checkrules_suddendeathend = checkrules_overtimesadded = checkrules_suddendeathwarning = 0;
-
-       readyrestart_happened = 1;
-       game_starttime = time;
-       if(!g_ca && !g_arena) { game_starttime += RESTART_COUNTDOWN; }
-               
-       restart_mapalreadyrestarted = 0; // reset this var, needed when cvar sv_ready_restart_repeatable is in use
-
-       // disable the warmup global for the server
-       inWarmupStage = 0; // once the game is restarted the game is in match stage
-
-       // reset the .ready status of all players (also spectators)
-       FOR_EACH_CLIENTSLOT(tmp_player) { tmp_player.ready = 0; }
-       readycount = 0;
-       Nagger_ReadyCounted(); // NOTE: this causes a resend of that entity, and will also turn off warmup state on the client
-
-       // lock teams with lockonrestart
-       if(autocvar_teamplay_lockonrestart && teamplay) 
-       {
-               lockteams = 1;
-               bprint("^1The teams are now locked.\n");
-       }
-
-       //initiate the restart-countdown-announcer entity
-       if(autocvar_sv_ready_restart_after_countdown && !g_ca && !g_arena)
-       {
-               restart_timer = spawn();
-               restart_timer.think = ReadyRestart_think;
-               restart_timer.nextthink = game_starttime;
-       }
-
-       // after a restart every players number of allowed timeouts gets reset, too
-       if(autocvar_sv_timeout) { FOR_EACH_REALPLAYER(tmp_player) { tmp_player.allowedTimeouts = autocvar_sv_timeout_number; } }
-
-       //reset map immediately if this cvar is not set
-       if not(autocvar_sv_ready_restart_after_countdown) { reset_map(TRUE); }
-
-       if(autocvar_sv_eventlog) { GameLogEcho(":restart"); }
-}
-
-void ReadyRestart()
-{
-       // no arena, assault support yet...
-       if(g_arena | g_assault | gameover | intermission_running | race_completing)
-               localcmd("restart\n");
-       else
-               localcmd("\nsv_hook_gamerestart\n");
-
-       // Reset ALL scores, but only do that at the beginning of the countdown if sv_ready_restart_after_countdown is off!
-       // Otherwise scores could be manipulated during the countdown.
-       if not(autocvar_sv_ready_restart_after_countdown) { Score_ClearAll(); }
-
-       ReadyRestart_force();
-       
-       return;
-}
-
-// Count the players who are ready and determine whether or not to restart the match // todo: add percentage ready support
-void ReadyCount()
-{
-       entity tmp_player;
-       float ready_needed_factor, ready_needed_count;
-       float t_ready, t_players;
-
-       FOR_EACH_REALPLAYER(tmp_player)
-       {
-               ++t_players;
-               if(tmp_player.ready) { ++t_ready; }
-       }
-
-       readycount = t_ready;
-
-       Nagger_ReadyCounted();
-
-       ready_needed_factor = bound(0.5, cvar("g_warmup_majority_factor"), 0.999);
-       ready_needed_count = floor(t_players * ready_needed_factor) + 1;
-       
-       if(readycount >= ready_needed_count)
-       {
-               ReadyRestart();
-       }
-               
-       return;
-}
-
-
-// ======================================
-//  Supporting functions for VoteCommand
-// ======================================
-
-float Votecommand_check_assignment(entity caller, float assignment)
-{
-       float from_server = (!caller);
-       
-       if((assignment == VC_ASGNMNT_BOTH) 
-               || ((!from_server && assignment == VC_ASGNMNT_CLIENTONLY) 
-               || (from_server && assignment == VC_ASGNMNT_SERVERONLY)))
-       {
-               return TRUE;
-       }
-
-       return FALSE;
-}
-
-string VoteCommand_getprefix(entity caller)
-{
-       if(caller)
-               return "cmd";
-       else
-               return "sv_cmd";
-}
-
-string VoteCommand_getname(entity caller)
-{
-       if(caller)
-               return caller.netname;
-       else
-               return ((autocvar_sv_adminnick != "") ? autocvar_sv_adminnick : autocvar_hostname);
-}
-
-string VoteCommand_extractcommand(string input, float startpos, float argc) 
-{
-       string output;
-       
-       if((argc - 1) < startpos)
-               output = "";
-       else
-               output = substring(input, argv_start_index(startpos), argv_end_index(-1) - argv_start_index(startpos));
-               
-       print("VoteCommand_parse: '", output, "'. \n");
-       return output;
-}
-
-float VoteCommand_checknasty(string vote_command)
-{
-       if((strstrofs(vote_command, ";", 0) >= 0)
-               || (strstrofs(vote_command, "\n", 0) >= 0)
-               || (strstrofs(vote_command, "\r", 0) >= 0)
-               || (strstrofs(vote_command, "$", 0) >= 0))
-               return FALSE;
-               
-       return TRUE;
-}
-
-float VoteCommand_checkinlist(string vote_command, string list)
-{
-       string l = strcat(" ", list, " ");
-       
-       if(strstrofs(l, strcat(" ", vote_command, " "), 0) >= 0)
-               return TRUE;
-       
-       // if gotomap is allowed, chmap is too, and vice versa
-       if(vote_command == "gotomap")
-               if(strstrofs(l, " chmap ", 0) >= 0)
-                       return TRUE;
-                       
-       if(vote_command == "chmap")
-               if(strstrofs(l, " gotomap ", 0) >= 0)
-                       return TRUE;
-       
-       return FALSE;
-}
-
-string ValidateMap(string validated_map, entity caller)
-{
-       validated_map = MapInfo_FixName(validated_map);
-       
-       if(!validated_map)
-       {
-               print_to(caller, "This map is not available on this server.");
-               return string_null;
-       }
-       
-       if(!autocvar_sv_vote_override_mostrecent && caller)
-       {
-               if(Map_IsRecent(validated_map))
-               {
-                       print_to(caller, "This server does not allow for recent maps to be played again. Please be patient for some rounds.");
-                       return string_null;
-               }
-       }
-       
-       if(!MapInfo_CheckMap(validated_map))
-       {
-               print_to(caller, strcat("^1Invalid mapname, \"^3", validated_map, "^1\" does not support the current game mode."));
-               return string_null;
-       }
-
-       return validated_map;
-}
-
-float VoteCommand_parse(entity caller, string vote_command, string vote_list, float startpos, float argc)
-{
-       string first_command;
-       entity victim;
-       
-       first_command = argv(startpos);
-
-       if not(VoteCommand_checkinlist(vote_command, vote_list))
-               return FALSE;
-
-       if((argc - 1) < startpos) // These commands won't work without arguments
-       {
-               switch(first_command)
-               {
-                       case "map":
-                       case "chmap":
-                       case "gotomap":
-                       case "kick":
-                       case "kickban":
-                               return FALSE;
-                               
-                       default: { break; }
-               }
-       }
-       
-       switch(first_command) // now go through and parse the proper commands to adjust as needed.
-       {
-               case "kick":
-               case "kickban": // catch all kick/kickban commands
-               {
-                       victim = edict_num(GetFilteredNumber(substring(vote_command, argv_start_index(startpos + 1), argv_end_index(-1) - argv_start_index(startpos + 1))));
-                       if not(victim) { return FALSE; }
-                       // TODO: figure out how kick/kickban/ban commands work and re-write this to fit around them
-                       vote_parsed_command = vote_command;
-                       vote_parsed_display = strcat("^1", vote_command, " (^7", victim.netname, "^1): ", "todo");
-                       
-                       break;
-               }
-               
-               case "map":
-               case "chmap":
-               case "gotomap": // re-direct all map selection commands to gotomap
-               {
-                       vote_command = ValidateMap(substring(vote_command, argv_start_index(startpos + 1), argv_end_index(-1) - argv_start_index(startpos + 1)), caller);
-                       if not(vote_command) { return FALSE; }
-                       vote_parsed_command = strcat("gotomap ", vote_command);
-                       vote_parsed_display = strzone(strcat("^1", vote_parsed_command));
-                       
-                       break;
-               }
-               
-               default: 
-               { 
-                       vote_parsed_command = vote_command;
-                       vote_parsed_display = strzone(strcat("^1", vote_command));
-                       
-                       break; 
-               }
-       }
-
-       return TRUE;
-}
-
-
-// =======================
-//  Command Sub-Functions
-// =======================
-
-void VoteCommand_abstain(float request, entity caller) // CLIENT ONLY
-{
-       switch(request)
-       {
-               case VC_REQUEST_COMMAND:
-               {
-                       if not(votecalled) { print_to(caller, "^1No vote called."); }
-                       else if not(caller.vote_selection == VOTE_SELECT_NULL || autocvar_sv_vote_change) { print_to(caller, "^1You have already voted."); }
-                       
-                       else // everything went okay, continue changing vote
-                       {
-                               print_to(caller, "^1You abstained from your vote.");
-                               caller.vote_selection = VOTE_SELECT_ABSTAIN;
-                               msg_entity = caller;
-                               if(!autocvar_sv_vote_singlecount) { VoteCount(); }
-                       }
-                       
-                       return;
-               }
-                       
-               default:
-               case VC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 vote abstain\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void VoteCommand_call(float request, entity caller, float argc, string vote_command) // BOTH
-{
-       switch(request)
-       {
-               case VC_REQUEST_COMMAND:
-               {
-                       float spectators_allowed = ((autocvar_sv_vote_nospectators != 2) 
-                               || ((autocvar_sv_vote_nospectators == 1) && inWarmupStage) 
-                               || (autocvar_sv_vote_nospectators == 0));
-                               
-                       float tmp_playercount;
-                       entity tmp_player;
-                       
-                       vote_command = VoteCommand_extractcommand(vote_command, 2, argc);
-                       
-                       if not(autocvar_sv_vote_call || !caller) { print_to(caller, "^1Vote calling is not allowed."); }
-                       else if(votecalled) { print_to(caller, "^1There is already a vote called."); }
-                       else if(!spectators_allowed && (caller && (caller.classname != "player"))) { print_to(caller, "^1Only players can call a vote."); }
-                       else if(timeoutStatus) { print_to(caller, "^1You can not call a vote while a timeout is active."); }
-                       else if(caller && (time < caller.vote_next)) { print_to(caller, strcat("^1You have to wait ^2", ftos(ceil(caller.vote_next - time)), "^1 seconds before you can again call a vote.")); }
-                       else if not(VoteCommand_checknasty(vote_command)) { print_to(caller, "^1Syntax error in command, see 'vhelp' for more info."); }
-                       else if not(VoteCommand_parse(caller, vote_command, autocvar_sv_vote_commands, 2, argc)) { print_to(caller, "^1This command is not acceptable, see 'vhelp' for more info."); }
-
-                       else // everything went okay, continue with calling the vote // TODO: fixes to make this more compatible with sv_cmd
-                       {
-                               votecalled = TRUE;
-                               votecalledmaster = FALSE;
-                               votecalledvote = strzone(vote_parsed_command);
-                               votecalledvote_display = strzone(vote_parsed_display);
-                               votefinished = time + autocvar_sv_vote_timeout;
-                               votecaller = caller; // remember who called the vote
-                               
-                               if(caller)
-                               {
-                                       caller.vote_selection = VOTE_SELECT_ACCEPT;
-                                       caller.vote_next = time + autocvar_sv_vote_wait;
-                                       msg_entity = caller; // todo: what is this for?
-                               }
-                               
-                               FOR_EACH_REALCLIENT(tmp_player) { ++tmp_playercount; }
-                               if(tmp_playercount > 1) { Announce("votecall"); } // don't announce a "vote now" sound if player is alone
-                               
-                               bprint("\{1}^2* ^3", VoteCommand_getname(votecaller), "^2 calls a vote for ", votecalledvote_display, "\n");
-                               if(autocvar_sv_eventlog) { GameLogEcho(strcat(":vote:vcall:", ftos(votecaller.playerid), ":", votecalledvote_display)); }
-                               Nagger_VoteChanged();
-                               VoteCount(); // needed if you are the only one
-                       }
-                       
-                       return;
-               }
-                       
-               default:
-               case VC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 vote call\n");
-                       print("  TODO.\n");
-                       return;
-               }
-       }
-}
-
-void VoteCommand_master(float request, entity caller, float argc, string vote_command) // CLIENT ONLY
-{
-       switch(request)
-       {
-               case VC_REQUEST_COMMAND:
-               {
-                       if(autocvar_sv_vote_master)
-                       {
-                               switch(strtolower(argv(2)))
-                               {
-                                       case "do":
-                                       {
-                                               vote_command = VoteCommand_extractcommand(vote_command, 3, argc);
-                                               
-                                               if not(caller.vote_master) { print_to(caller, "^1You do not have vote master privelages."); }
-                                               else if not(VoteCommand_checknasty(vote_command)) { print_to(caller, "^1Syntax error in command, see 'vhelp' for more info."); }
-                                               else if not(VoteCommand_parse(caller, vote_command, autocvar_sv_vote_master_commands, 3, argc)) { print_to(caller, "^1This command is not acceptable, see 'vhelp' for more info."); }
-                                               
-                                               else // everything went okay, proceed with command
-                                               {
-                                                       localcmd(strcat(vote_parsed_command, "\n"));
-                                                       print_to(caller, strcat("Executing command '", vote_parsed_display, "' on server."));
-                                                       bprint("\{1}^2* ^3", VoteCommand_getname(caller), "^2 used their ^3master^2 status to do \"^2", vote_parsed_display, "^2\".\n");
-                                                       if(autocvar_sv_eventlog) { GameLogEcho(strcat(":vote:vdo:", ftos(caller.playerid), ":", vote_parsed_display)); }
-                                               }
-                                               
-                                               return;
-                                       }
-                                       
-                                       case "login":
-                                       {
-                                               if not(autocvar_sv_vote_master_password != "") { print_to(caller, "^1Login to vote master is not allowed."); }
-                                               else if(caller.vote_master) { print_to(caller, "^1You are already logged in as vote master."); }
-                                               else if not(autocvar_sv_vote_master_password == argv(3)) { print_to(caller, strcat("Rejected vote master login from ", VoteCommand_getname(caller))); }
-
-                                               else // everything went okay, proceed with giving this player master privilages
-                                               {
-                                                       caller.vote_master = TRUE;
-                                                       print_to(caller, strcat("Accepted vote master login from ", VoteCommand_getname(caller)));
-                                                       bprint("\{1}^2* ^3", VoteCommand_getname(caller), "^2 logged in as ^3master^2\n");
-                                                       if(autocvar_sv_eventlog) { GameLogEcho(strcat(":vote:vlogin:", ftos(caller.playerid))); }
-                                               }
-                                               
-                                               return;
-                                       }
-                                       
-                                       default: // calling a vote for master
-                                       {
-                                               if not(autocvar_sv_vote_master_callable) { print_to(caller, "^1Vote to become vote master is not allowed."); }
-                                               else if(votecalled) { print_to(caller, "^1There is already a vote called."); }
-                                               
-                                               else // everything went okay, continue with creating vote
-                                               {
-                                                       votecalled = TRUE;
-                                                       votecalledmaster = TRUE;
-                                                       votecalledvote = strzone("XXX");
-                                                       votecalledvote_display = strzone("^3master");
-                                                       votefinished = time + autocvar_sv_vote_timeout;
-                                                       votecaller = caller;
-                                                       
-                                                       caller.vote_selection = VOTE_SELECT_ACCEPT;
-                                                       caller.vote_next = time + autocvar_sv_vote_wait;
-                                                       
-                                                       bprint("\{1}^2* ^3", VoteCommand_getname(votecaller), "^2 calls a vote to become ^3master^2.\n");
-                                                       if(autocvar_sv_eventlog) { GameLogEcho(strcat(":vote:vcall:", ftos(votecaller.playerid), ":", votecalledvote_display)); }
-                                                       Nagger_VoteChanged();
-                                                       VoteCount(); // needed if you are the only one
-                                               }
-                                               
-                                               return;
-                                       }
-                               }
-                       }
-                       else { print_to(caller, "^1Master control of voting is not allowed."); }
-                       
-                       return;
-               }
-                       
-               default:
-               case VC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 vote master action [arguments]\n");
-                       print("  TODO.\n");
-                       return;
-               }
-       }
-}
-
-void VoteCommand_no(float request, entity caller) // CLIENT ONLY
-{
-       switch(request)
-       {
-               case VC_REQUEST_COMMAND:
-               {
-                       if not(votecalled) { print_to(caller, "^1No vote called."); }
-                       else if not(caller.vote_selection == VOTE_SELECT_NULL || autocvar_sv_vote_change) { print_to(caller, "^1You have already voted."); }
-                       
-                       else // everything went okay, continue changing vote
-                       {
-                               print_to(caller, "^1You rejected the vote.");
-                               caller.vote_selection = VOTE_SELECT_REJECT;
-                               msg_entity = caller;
-                               if(!autocvar_sv_vote_singlecount) { VoteCount(); }
-                       }
-                       
-                       return;
-               }
-                       
-               default:
-               case VC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 vote no\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void VoteCommand_status(float request, entity caller) // BOTH
-{
-       switch(request)
-       {
-               case VC_REQUEST_COMMAND:
-               {
-                       if(votecalled)
-                               print_to(caller, strcat("^7Vote for ", votecalledvote_display, "^7 called by ^7", VoteCommand_getname(votecaller), "^7."));
-                       else
-                               print_to(caller, "^1No vote called.");
-                               
-                       return;
-               }
-                       
-               default:
-               case VC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 vote status\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void VoteCommand_stop(float request, entity caller) // BOTH
-{
-       switch(request)
-       {
-               case VC_REQUEST_COMMAND:
-               {
-                       if not(votecalled) { print_to(caller, "^1No vote called."); }
-                       else if((caller == votecaller) || !caller || caller.vote_master) { VoteStop(caller); }
-                       else { print_to(caller, "^1You are not allowed to stop that vote."); }
-                       
-                       return;
-               }
-                       
-               default:
-               case VC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 vote stop\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-void VoteCommand_yes(float request, entity caller) // CLIENT ONLY
-{
-       switch(request)
-       {
-               case VC_REQUEST_COMMAND:
-               {
-                       if not(votecalled) { print_to(caller, "^1No vote called."); }
-                       if not(caller.vote_selection == VOTE_SELECT_NULL || autocvar_sv_vote_change) { print_to(caller, "^1You have already voted."); }
-                       
-                       else // everything went okay, continue changing vote
-                       {
-                               print_to(caller, "^1You accepted the vote.");
-                               caller.vote_selection = VOTE_SELECT_ACCEPT;
-                               msg_entity = caller;
-                               if(!autocvar_sv_vote_singlecount) { VoteCount(); }
-                       }
-                       
-                       return;
-               }
-                       
-               default:
-               case VC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 vote yes\n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-
-/* use this when creating a new command, making sure to place it in alphabetical order.
-void VoteCommand_(float request)
-{
-       switch(request)
-       {
-               case VC_REQUEST_COMMAND:
-               {
-                       
-                       return;
-               }
-                       
-               default:
-               case VC_REQUEST_USAGE:
-               {
-                       print("\nUsage:^3 vote \n");
-                       print("  No arguments required.\n");
-                       return;
-               }
-       }
-}
-*/
-
-
-// ================================
-//  Macro system for vote commands
-// ================================
-
-// Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
-#define VOTE_COMMANDS(request,caller,arguments,command) \
-       VOTE_COMMAND("abstain", VoteCommand_abstain(request, caller), "Abstain your vote in current vote", VC_ASGNMNT_CLIENTONLY) \
-       VOTE_COMMAND("call", VoteCommand_call(request, caller, arguments, command), "Create a new vote for players to decide on", VC_ASGNMNT_BOTH) \
-       VOTE_COMMAND("help", VoteCommand_macro_help(caller, arguments), "Shows this information", VC_ASGNMNT_BOTH) \
-       VOTE_COMMAND("master", VoteCommand_master(request, caller, arguments, command), "", VC_ASGNMNT_CLIENTONLY) \
-       VOTE_COMMAND("no", VoteCommand_no(request, caller), "Select no in current vote", VC_ASGNMNT_CLIENTONLY) \
-       VOTE_COMMAND("status", VoteCommand_status(request, caller), "Prints information about current vote", VC_ASGNMNT_BOTH) \
-       VOTE_COMMAND("stop", VoteCommand_stop(request, caller), "Immediately end a vote", VC_ASGNMNT_BOTH) \
-       VOTE_COMMAND("yes", VoteCommand_yes(request, caller), "Select yes in current vote", VC_ASGNMNT_CLIENTONLY) \
-       /* nothing */
-
-void VoteCommand_macro_help(entity caller, float argc)
-{
-       string command_origin = VoteCommand_getprefix(caller);
-       
-       if(argc == 2) // help display listing all commands
-       {
-               print("\nUsage:^3 ", command_origin, " vote COMMAND...^7, where possible commands are:\n");
-               
-               #define VOTE_COMMAND(name,function,description,assignment) \
-                       { if(Votecommand_check_assignment(caller, assignment)) { print("  ^2", name, "^7: ", description, "\n"); } }
-                       
-               VOTE_COMMANDS(0, caller, 0, "")
-               #undef VOTE_COMMAND
-               
-               print("For help about specific commands, type ", command_origin, " vote help COMMAND\n");
-       }
-       else // usage for individual command
-       {
-               #define VOTE_COMMAND(name,function,description,assignment) \
-                       { if(Votecommand_check_assignment(caller, assignment)) { if(name == strtolower(argv(2))) { function; return; } } }
-                       
-               VOTE_COMMANDS(VC_REQUEST_USAGE, caller, argc, "")
-               #undef VOTE_COMMAND
-       }
-       
-       return;
-}
-
-float VoteCommand_macro_command(entity caller, float argc, string vote_command)
-{
-       #define VOTE_COMMAND(name,function,description,assignment) \
-               { if(Votecommand_check_assignment(caller, assignment)) { if(name == strtolower(argv(1))) { function; return TRUE; } } }
-               
-       VOTE_COMMANDS(VC_REQUEST_COMMAND, caller, argc, vote_command)
-       #undef VOTE_COMMAND
-       
-       return FALSE;
-}
-
-
-// ======================================
-//  Main function handling vote commands
-// ======================================
-
-void VoteCommand(float request, entity caller, float argc, string vote_command) 
-{
-       // Guide for working with argc arguments by example:
-       // argc:   1    - 2      - 3     - 4
-       // argv:   0    - 1      - 2     - 3 
-       // cmd     vote - master - login - password
-       
-       switch(request)
-       {
-               case VC_REQUEST_COMMAND:
-               {
-                       if(VoteCommand_macro_command(caller, argc, vote_command))
-                               return;
-               }
-                       
-               default:
-                       print_to(caller, strcat("Unknown vote command", ((argv(1) != "") ? strcat(" \"", argv(1), "\"") : ""), ". For a list of supported commands, try ", VoteCommand_getprefix(caller), " help.\n"));
-               case VC_REQUEST_USAGE:
-               {
-                       VoteCommand_macro_help(caller, argc);
-                       return;
-               }
-       }
-}
-
-// =======================
-//  Game logic for voting
-// =======================
-
-void VoteHelp(entity e) {
-       string vmasterdis;
-       if(!autocvar_sv_vote_master) {
-               vmasterdis = " ^1(disabled)";
-       }
-
-       string vlogindis;
-       if("" == autocvar_sv_vote_master_password) {
-               vlogindis = " ^1(disabled)";
-       }
-
-       string vcalldis;
-       if(!autocvar_sv_vote_call) {
-               vcalldis = " ^1(disabled)";
-       }
-
-       print_to(e, "^7You can use voting with \"^2cmd vote help^7\" \"^2cmd vote status^7\" \"^2cmd vote call ^3COMMAND ARGUMENTS^7\" \"^2cmd vote stop^7\" \"^2cmd vote master^7\" \"^2cmd vote login^7\" \"^2cmd vote do ^3COMMAND ARGUMENTS^7\" \"^2cmd vote yes^7\" \"^2cmd vote no^7\" \"^2cmd vote abstain^7\" \"^2cmd vote dontcare^7\".");
-       print_to(e, "^7Or if your version is up to date you can use these aliases \"^2vhelp^7\" \"^2vstatus^7\" \"^2vcall ^3COMMAND ARGUMENTS^7\" \"^2vstop^7\" \"^2vmaster^7\" \"^2vlogin^7\" \"^2vdo ^3COMMAND ARGUMENTS^7\" \"^2vyes^7\" \"^2vno^7\" \"^2abstain^7\" \"^2vdontcare^7\".");
-       print_to(e, "^7\"^2help^7\" shows this info.");
-       print_to(e, "^7\"^2status^7\" shows if there is a vote called and who called it.");
-       print_to(e, strcat("^7\"^2call^7\" is used to call a vote. See the list of allowed commands.", vcalldis, "^7"));
-       print_to(e, "^7\"^2stop^7\" can be used by the vote caller or an admin to stop a vote and maybe correct it.");
-       print_to(e, strcat("^7\"^2master^7\" call a vote to become master who can execute commands without a vote", vmasterdis, "^7"));
-       print_to(e, strcat("^7\"^2login^7\" login to become master who can execute commands without a vote.", vlogindis, "^7"));
-       print_to(e, "^7\"^2do^7\" executes a command if you are a master. See the list of allowed commands.");
-       print_to(e, "^7\"^2yes^7\", \"^2no^7\", \"^2abstain^7\" and \"^2dontcare^7\" to make your vote.");
-       print_to(e, "^7If enough of the players vote yes the vote is accepted.");
-       print_to(e, "^7If enough of the players vote no the vote is rejected.");
-       print_to(e, strcat("^7If neither the vote will timeout after ", ftos(autocvar_sv_vote_timeout), "^7 seconds."));
-       print_to(e, "^7You can call a vote for or execute these commands:");
-       print_to(e, strcat("^3", autocvar_sv_vote_commands, "^7 and maybe further ^3arguments^7"));
-}
\ No newline at end of file
diff --git a/qcsrc/server/vote.qh b/qcsrc/server/vote.qh
deleted file mode 100644 (file)
index fb34ba2..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-float votecalled;
-string votecalledvote;
-string votecalledvote_display;
-float votecalledmaster;
-entity votecaller;
-float votefinished;
-.float vote_master;
-.float vote_next;
-.float vote_selection;
-float vote_accept_count;
-float vote_reject_count;
-float vote_abstain_count;
-float vote_needed_overall;
-
-string VoteCommand_getname(entity caller);
-void VoteCommand(float request, entity caller, float argc, string vote_command);
-void VoteHelp(entity e);
-void VoteThink();
-void VoteReset();
-void VoteAccept();
-void VoteReject();
-void VoteTimeout();
-void VoteStop(entity stopper);
-void VoteSpam(float notvoters, float mincount, string result);
-void VoteCount();
-
-// =========================
-//  warmup and nagger stuff
-// =========================
-
-#define RESTART_COUNTDOWN 10
-entity nagger;
-.float ready;
-float readycount;
-float readyrestart_happened;
-float restart_mapalreadyrestarted; // bool, indicates whether reset_map() was already executed
-void ReadyCount();
\ No newline at end of file