Merge remote-tracking branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sun, 25 Sep 2011 18:14:37 +0000 (14:14 -0400)
committerSamual <samual@xonotic.org>
Sun, 25 Sep 2011 18:14:37 +0000 (14:14 -0400)
Conflicts:
qcsrc/server/clientcommands.qc
qcsrc/server/defs.qh
qcsrc/server/gamecommand.qc

1  2 
defaultXonotic.cfg
qcsrc/server/bot/scripting.qc
qcsrc/server/clientcommands.qc
qcsrc/server/defs.qh
qcsrc/server/gamecommand.qc

Simple merge
Simple merge
@@@ -255,910 -571,83 +255,922 @@@ void restartTimer_Think() 
        return;
  }
  
 -/**
 - * Checks whether the player who calls the timeout is allowed to do so.
 - * If so, it initializes the timeout countdown. It also checks whether another
 - * timeout was already running at this time and reacts correspondingly.
 - *
 - * affected globals/fields: .allowedTimeouts, remainingTimeoutTime, remainingLeadTime,
 - *                          timeoutInitiator, timeoutStatus, timeoutHandler
 - *
 - * This function is called when a player issues the calltimeout command.
 - */
 -void evaluateTimeout() {
 -      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
 -                      local float myTl;
 -                      myTl = autocvar_timelimit;
 -
 -                      local 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");
 -              }
 +
 +// =======================
 +//  Command Sub-Functions
 +// =======================
 +
 +void ClientCommand_autoswitch(float request, float argc)
 +{
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(self, "  ^2autoswitch^7: Whether or not to switch automatically when getting a better weapon\n");
 +                      return;
 +                      
 +              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_HELP:
 +                      sprint(self, "  ^2checkfail^7: Report if a client-side check failed\n");
 +                      return;
 +                      
 +              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;
        }
 -      //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;
 +}
 +
 +void ClientCommand_clientversion(float request, float argc) // used only by client side code
 +{
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(self, "  ^2clientversion^7: Release version of the game\n");
 +                      return;
 +                      
 +              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;
        }
 -      timeoutHandler.nextthink = time; //always let the entity think asap
 +}
  
 -      //inform all connected clients about the timeout call
 -      Announce("timeoutcalled");
 +void ClientCommand_cvar_changes(float request)
 +{
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(self, "  ^2cvar_changes^7: Prints a list of all changed server cvars\n");
 +                      return;
 +                      
 +              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;
 +      }
  }
  
 -/**
 - * Checks whether a player is allowed to resume the game. If he is allowed to do it,
 - * and the lead time for the timeout is still active, this countdown just will be aborted (the
 - * game will never be paused). Otherwise the remainingTimeoutTime will be set to the corresponding
 - * value of the cvar sv_timeout_resumetime.
 - *
 - * This function is called when a player issues the resumegame command.
 - */
 -void evaluateTimein() {
 -      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");
 +void ClientCommand_cvar_purechanges(float request)
 +{
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(self, "  ^2cvar_purechanges^7: Prints a list of all changed gameplay cvars\n");
 +                      return;
 +                      
 +              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_info(float request, float argc)
 +{
 +      string command;
 +      
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(self, "  ^2info^7: Request for unique server information set up by admin\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      command = cvar_string_builtin(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_HELP:
 +                      sprint(self, "  ^2join^7: Become a player in the game\n");
 +                      return;
 +                      
 +              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_atprio(self, CENTERPRIO_MAPVOTE, PREVENT_JOIN_TEXT);
++                                              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_HELP:
 +                      sprint(self, "  ^2ladder^7: Get information about top players if supported\n");
 +                      return;
 +                      
 +              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_HELP:
 +                      sprint(self, "  ^2lsmaps^7: List maps which can be used with the current game mode\n");
 +                      return;
 +                      
 +              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_HELP:
 +                      sprint(self, "  ^2lsnewmaps^7: List maps which TODO\n");
 +                      return;
 +                      
 +              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_HELP:
 +                      sprint(self, "  ^2maplist^7: Full server maplist reply\n");
 +                      return;
 +                      
 +              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_HELP:
 +                      sprint(self, "  ^2rankings^7: Print information about rankings\n");
 +                      return;
 +                      
 +              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_HELP:
 +                      sprint(self, "  ^2ready^7: Qualify as ready to end warmup stage (or restart server if allowed)\n");
 +                      return;
 +                      
 +              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?
 +{
 +      float i;
 +      
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(self, "  ^2records^7: List top 10 records for the current map\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      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
 +{
 +      float tokens;
 +      string s;
 +      
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(self, "  ^2reportcvar^7: Old system for sending a client cvar to the server\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      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_HELP:
 +                      sprint(self, "  ^2say^7: Print a message to chat to all players\n");
 +                      return;
 +                      
 +              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_HELP:
 +                      sprint(self, "  ^2say_team^7: Print a message to chat to all team mates\n");
 +                      return;
 +                      
 +              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
 +{
++      float selection;
++      
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(self, "  ^2selectteam^7: Attempt to choose a team to join into\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      if (self.flags & FL_CLIENT)
 +                      {
 +                              if(teamplay)
 +                                      if not(self.team_forced > 0) 
 +                                              if not(lockteams) 
++                                              {
 +                                                      switch(argv(1))
 +                                                      {
-                                                               case "red": ClientKill_TeamChange(COLOR_TEAM1); break;
-                                                               case "blue": ClientKill_TeamChange(COLOR_TEAM2); break;
-                                                               case "yellow": ClientKill_TeamChange(COLOR_TEAM3); break;
-                                                               case "pink": ClientKill_TeamChange(COLOR_TEAM4); break;
-                                                               case "auto": ClientKill_TeamChange(-1); break;
++                                                              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)
++                                                                      ClientKill_TeamChange(selection);
++                                                              else
++                                                                      sprint(self, "^7You already are on that team.\n");
++                                                      }
++                                              }
 +                                              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, "selectteam can not be used as your team is forced\n");
++                                              sprint(self, "^7selectteam can not be used as your team is forced\n");
 +                              else
-                                       sprint(self, "selectteam can only be used in teamgames\n");
++                                      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_sentcvar(float request, float argc, string command)
 +{
 +      float tokens;
 +      string s;
 +      
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(self, "  ^2sentcvar^7: New system for sending a client cvar to the server\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      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_HELP:
 +                      sprint(self, "  ^2spectate^7: Become an observer\n");
 +                      return;
 +                      
 +              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_HELP:
 +                      sprint(self, "  ^2suggestmap^7: Suggest a map to the mapvote at match end\n");
 +                      return;
 +                      
 +              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_HELP:
 +                      sprint(self, "  ^2teamstatus^7: Print detailed score information for all players\n");
 +                      return;
 +                      
 +              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)
 +{
 +      entity e;
 +      
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(self, "  ^2tell^7: Send a message directly to a player\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      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_HELP:
 +                      sprint(self, "  ^2timein^7: Resume the game from being paused with a timeout\n");
 +                      return;
 +                      
 +              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_HELP:
 +                      sprint(self, "  ^2timeout^7: Call a timeout which pauses the game for certain amount of time unless unpaused\n");
 +                      return;
 +                      
 +              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_HELP:
 +                      sprint(self, "  ^2voice^7: Send voice message via sound\n");
 +                      return;
 +                      
 +              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;
        }
  }
- }
 +
 +/*
 +void ClientCommand_(float request)
 +{
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(self, "  ^2blah^7: foobar\n");
 +                      return;
 +                      
 +              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;
 +      }
 +}
 +*/
 +
 +
 +// ======================================
 +//  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 search_request_type;
 +      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 "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_autoswitch(CC_REQUEST_HELP, 0);
 +                      ClientCommand_checkfail(CC_REQUEST_HELP, "");
 +                      ClientCommand_clientversion(CC_REQUEST_HELP, 0);
 +                      ClientCommand_cvar_changes(CC_REQUEST_HELP);
 +                      ClientCommand_cvar_purechanges(CC_REQUEST_HELP);
 +                      ClientCommand_info(CC_REQUEST_HELP, 0);
 +                      ClientCommand_join(CC_REQUEST_HELP); 
 +                      ClientCommand_ladder(CC_REQUEST_HELP);
 +                      ClientCommand_lsmaps(CC_REQUEST_HELP);
 +                      ClientCommand_lsnewmaps(CC_REQUEST_HELP);
 +                      ClientCommand_maplist(CC_REQUEST_HELP);
 +                      ClientCommand_rankings(CC_REQUEST_HELP);
 +                      ClientCommand_ready(CC_REQUEST_HELP);
 +                      ClientCommand_records(CC_REQUEST_HELP);
 +                      ClientCommand_reportcvar(CC_REQUEST_HELP, 0, "");
 +                      ClientCommand_say(CC_REQUEST_HELP, 0, "");
 +                      ClientCommand_say_team(CC_REQUEST_HELP, 0, "");
 +                      ClientCommand_selectteam(CC_REQUEST_HELP, 0);
 +                      ClientCommand_sentcvar(CC_REQUEST_HELP, 0, "");
 +                      ClientCommand_spectate(CC_REQUEST_HELP);
 +                      ClientCommand_suggestmap(CC_REQUEST_HELP, 0);
 +                      ClientCommand_teamstatus(CC_REQUEST_HELP);
 +                      ClientCommand_tell(CC_REQUEST_HELP, 0, "");
 +                      ClientCommand_timein(CC_REQUEST_HELP);
 +                      ClientCommand_timeout(CC_REQUEST_HELP);
 +                      ClientCommand_voice(CC_REQUEST_HELP, 0, "");
 +                      sprint(self, "For help about specific commands, type cmd help COMMAND\n");
 +                      return;
 +              } 
 +              else
 +                      search_request_type = CC_REQUEST_USAGE; // Instead of trying to call a command, we're going to see detailed information about it
 +      } 
 +      else*/ if(GameCommand_Vote(command, self)) 
 +      {
 +              return; // handled by server/vote.qc 
 +      }
 +      else if(GameCommand_MapVote(argv(0))) 
 +      {
 +              return; // handled by server/g_world.qc
 +      }
 +      else if(CheatCommand(argc)) 
 +      {
 +              return; // handled by server/cheats.qc
 +      }
 +      else
 +              search_request_type = CC_REQUEST_COMMAND; // continue as usual and scan for normal commands
 +      
 +      switch(strtolower((search_request_type == CC_REQUEST_USAGE) ? argv(1) : argv(0)))
 +      {
 +              // Do not hard code aliases for these, instead create them in defaultXonotic.cfg
 +              // also: keep in alphabetical order, please ;)
 +              
 +              case "autoswitch": ClientCommand_autoswitch(search_request_type, argc); break;
 +              case "checkfail": ClientCommand_checkfail(search_request_type, command); break;
 +              case "clientversion": ClientCommand_clientversion(search_request_type, argc); break;
 +              case "cvar_changes": ClientCommand_cvar_changes(search_request_type); break;
 +              case "cvar_purechanges": ClientCommand_cvar_purechanges(search_request_type); break;
 +              case "info": ClientCommand_info(search_request_type, argc); break;
 +              case "join": ClientCommand_join(search_request_type); break;
 +              case "ladder": ClientCommand_ladder(search_request_type); break;
 +              case "lsmaps": ClientCommand_lsmaps(search_request_type); break;
 +              case "lsnewmaps": ClientCommand_lsnewmaps(search_request_type); break;
 +              case "maplist": ClientCommand_maplist(search_request_type); break;
 +              case "rankings": ClientCommand_rankings(search_request_type); break;
 +              case "ready": ClientCommand_ready(search_request_type); break;
 +              case "records": ClientCommand_records(search_request_type); break;
 +              case "reportcvar": ClientCommand_reportcvar(search_request_type, argc, command); break;
 +              case "say": ClientCommand_say(search_request_type, argc, command); break;
 +              case "say_team": ClientCommand_say_team(search_request_type, argc, command); break;
 +              case "selectteam": ClientCommand_selectteam(search_request_type, argc); break;
 +              case "sentcvar": ClientCommand_sentcvar(search_request_type, argc, command); break;
 +              case "spectate": ClientCommand_spectate(search_request_type); break;
 +              case "suggestmap": ClientCommand_suggestmap(search_request_type, argc); break;
 +              case "teamstatus": ClientCommand_teamstatus(search_request_type); break;
 +              case "tell": ClientCommand_tell(search_request_type, argc, command); break;
 +              case "timein": ClientCommand_timein(search_request_type); break;
 +              case "timeout": ClientCommand_timeout(search_request_type); break;
 +              case "voice": ClientCommand_voice(search_request_type, argc, command); break;
 +              
 +              default:
 +                      clientcommand(self, command); //print("Invalid command. For a list of supported commands, try cmd help.\n");
 +      }
++}
@@@ -284,7 -286,8 +286,6 @@@ float orig_slowmo; // contains the valu
  .vector lastV_angle; //used when pausing the game in order to force the player to keep his old view angle fixed
  entity timeoutHandler; //responsible for centerprinting the timeout countdowns and playing sounds
  void timeoutHandler_Think();
- string getTimeoutText(float addOneSecond);
 -void evaluateTimeout();
 -void evaluateTimein();
  
  .float spawnshieldtime;
  
@@@ -487,1735 -696,809 +487,1772 @@@ void modelbug(
        e.nextthink = time + 1;
  }
  
 -void GameCommand(string command)
 +
 +// =======================
 +//  Command Sub-Functions
 +// =======================
 +
 +void GameCommand_adminmsg(float request, float argc)
  {
 -      float argc;
 -      entity client, e;
 -      vector v;
 -      float entno, i, n;
 +      entity client;
 +      float entno = stof(argv(1)); 
 +      float n, i;
        string s;
 -      argc = tokenize_console(command);
 -
 -      if(argv(0) == "help" || argc == 0)
 +      
 +      switch(request)
        {
 -              print("Usage: sv_cmd COMMAND..., where possible commands are:\n");
 -              print("  adminmsg clientnumber \"message\" [infobartime]\n");
 -              print("  teamstatus\n");
 -              print("  printstats\n");
 -              print("  make_mapinfo\n");
 -              print("  gametype dm|ctf|...\n");
 -              print("  savedb filename\n");
 -              print("  dumpdb filename\n");
 -              print("  loaddb filename\n");
 -              print("  allready\n");
 -              print("  effectindexdump\n");
 -              print("  radarmap [--force] [--quit | --loop] [sharpness]\n");
 -              print("  bbox\n");
 -              print("  cvar_changes\n");
 -              print("  cvar_purechanges\n");
 -              print("  find classname\n");
 -              print("  extendmatchtime\n");
 -              print("  reducematchtime\n");
 -              print("  warp [level]\n");
 -              GameCommand_Vote("help", world);
 -              GameCommand_Ban("help");
 -              GameCommand_Generic("help");
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2adminmsg^7: Send an admin message to a client directly\n");
 +                      return;
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      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_atprio(client, CENTERPRIO_ADMIN, strcat("^3", admin_name(), ":\n\n^7", argv(2)));
++                                                      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;
        }
 +}
  
 -      if(GameCommand_Vote(command, world))
 -              return;
 -
 -      if(GameCommand_Ban(command))
 -              return;
 -
 -      if(GameCommand_Generic(command))
 -              return;
 -
 -      if(argv(0) == "printstats")
 +void GameCommand_allready(float request)
 +{
 +      switch(request)
        {
 -              DumpStats(FALSE);
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2allready^7: Restart the server and reset the players\n");
 +                      return;
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      ReadyRestart();
 +                      return;
 +                      
 +              default:
 +              case GC_REQUEST_USAGE:
 +                      print("\nUsage:^3 sv_cmd allready\n");
 +                      print("  No arguments required.\n");
 +                      return;
        }
 +}
  
 -      if(argv(0) == "make_mapinfo")
 +void GameCommand_allspec(float request, float argc)
 +{
 +      entity client;
 +      float i;
 +      
 +      switch(request)
        {
 -              e = spawn();
 -              e.classname = "make_mapinfo";
 -              e.think = make_mapinfo_Think;
 -              e.nextthink = time;
 -              MapInfo_Enumerate();
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2allspec^7: Force all players to spectate\n");
 +                      return;
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      FOR_EACH_PLAYER(client)
 +                      {
 +                              self = client;
 +                              PutObserverInServer();
 +                              ++i;
 +                      }
 +                      if(i) { bprint(strcat("Successfully forced all (", ftos(i), ") players to spectate", (argv(1) ? strcat(" for reason: '", argv(1), "'") : ""), ".\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^7\n");
 +                      return;
        }
 +}
  
 -      if(argv(0) == "gotomap") if(argc == 2)
 +void GameCommand_anticheat(float request, float argc) // FIXME: player entity is never found
 +{
 +      entity client;
 +      float entno = stof(argv(1)); 
 +      
 +      switch(request)
        {
 -              print(GotoMap(argv(1)), "\n");
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2anticheat^7: Create an anticheat report for a client\n");
 +                      return;
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      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;
        }
 +}
  
 -      if(argv(0) == "gametype") if(argc == 2)
 +void GameCommand_bbox(float request)
 +{
 +      switch(request)
        {
 -              float t, tsave;
 -              s = argv(1);
 -              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");
 -                      }
 +              case GC_REQUEST_HELP:
 +                      print("  ^2bbox^7: Print detailed information about world size\n");
 +                      return;
 +                      
 +              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
 -                      {
 -                              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;
 +                              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;
        }
 +}
  
 -      if(argv(0) == "adminmsg")
 -      if(argc >= 3 && argc <= 4)
 +void GameCommand_bot_cmd(float request, float argc) // what a mess... old old code.
 +{
 +      entity bot;
 +      
 +      switch(request)
        {
 -              entno = stof(argv(1));
 -
 -              if((entno < 0) | (entno > maxclients)) {
 -                      print("Player ", argv(1), " doesn't exist\n");
 +              case GC_REQUEST_HELP:
 +                      print("  ^2bot_cmd^7: Control and send commands to bots\n");
                        return;
 -              }
 -
 -              n = 0;
 -              for(i = (entno ? entno : 1); i <= (entno ? entno : maxclients); ++i)
 -              {
 -                      client = edict_num(i);
 -                      if(client.flags & FL_CLIENT)
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      if(argv(1) == "reset")
 +                      {
 +                              bot_resetqueues();
 +                              return;
 +                      }
 +                      else if(argv(1) == "load" && argc == 3)
                        {
 -                              if(argc == 4)
 +                              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)))
                                {
 -                                      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));
 +                                      argc = tokenize_console(s);
 +
 +                                      if(argc >= 3 && argv(0) == "sv_cmd" && argv(1) == "bot_cmd")
 +                                      {
 +                                              // let's start at token 2 so we can skip sv_cmd bot_cmd
 +                                              bot = find_bot_by_number(stof(argv(2)));
 +                                              if(bot == world)
 +                                                      bot = find_bot_by_name(argv(2));
 +                                              if(bot)
 +                                                      bot_queuecommand(bot, strcat(argv(3), " ", argv(4)));
 +                                      }
 +                                      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)
                                {
 -                                      centerprint(client, strcat("^3", admin_name(), ":\n\n^7", argv(2)));
 -                                      sprint(client, strcat("\{1}\{13}^3", admin_name(), "^7: ", argv(2), "\n"));
 +                                      print(strcat("Command '", (argv(2), " ", argv(3)), "' sent to bot ", bot.netname, "\n"));
 +                                      bot_queuecommand(bot, strcat(argv(2), " ", argv(3)));
 +                                      return;
                                }
 -                              print("Message sent to ", client.netname, "\n");
 -                              ++n;
 +                              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
                        }
 -              }
 -              if(!n)
 -                      print("Client not found\n");
 -
 -              return;
 +                      
 +              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;
        }
 +}
  
 -      if(argv(0) == "savedb") if(argc == 2)
 +void GameCommand_cointoss(float request, float argc)
 +{
 +      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);
 +      
 +      switch(request)
        {
 -              db_save(ServerProgsDB, argv(1));
 -              print("DB saved.\n");
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2cointoss^7: Flip a virtual coin and give random result\n");
 +                      return;
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      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;
        }
 +}
  
 -      if(argv(0) == "dumpdb") if(argc == 2)
 +void GameCommand_cvar_changes(float request)
 +{
 +      switch(request)
        {
 -              db_dump(ServerProgsDB, argv(1));
 -              print("DB dumped.\n");
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2cvar_changes^7: Prints a list of all changed server cvars\n");
 +                      return;
 +                      
 +              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;
        }
 +}
  
 -      if(argv(0) == "loaddb") if(argc == 2)
 +void GameCommand_cvar_purechanges(float request)
 +{
 +      switch(request)
        {
 -              db_close(ServerProgsDB);
 -              ServerProgsDB = db_load(argv(1));
 -              print("DB loaded.\n");
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2cvar_purechanges^7: Prints a list of all changed gameplay cvars\n");
 +                      return;
 +                      
 +              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;
        }
 +}
  
 -      if (argv(0) == "nospectators")
 +void GameCommand_database(float request, float argc)
 +{
 +      switch(request)
        {
 -              blockSpectators = 1;
 -              local 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")
 +              case GC_REQUEST_HELP:
 +                      print("  ^2database^7: Extra controls of the serverprogs database\n");
 +                      return;
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      if(argc == 3)
                        {
 -                              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"));
 +                              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;
 +                              }
                        }
 -              }
 -              bprint(strcat("^7All spectators will be automatically kicked when not joining the game after ", ftos(autocvar_g_maxplayers_spectator_blocktime), " seconds!\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;
        }
 +}
  
 -      if (argv(0) == "lockteams")
 +void GameCommand_defer_clear(float request, float argc)
 +{
 +      entity client;
 +      float entno = stof(argv(1));
 +      
 +      switch(request)
        {
 -              if(teamplay)
 -              {
 -                      lockteams = 1;
 -                      bprint("^1The teams are now locked.\n");
 -              }
 -              else
 -                      bprint("That command can only be used in a team-based gamemode.\n");
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2defer_clear^7: Clear all queued defer commands for client\n");
 +                      return;
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      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;
        }
 +}
  
 -      if (argv(0) == "unlockteams")
 +void GameCommand_defer_clear_all(float request)
 +{
 +      entity client;
 +      float i;
 +      float argc;
 +      
 +      switch(request)
        {
 -              if(teamplay)
 -              {
 -                      lockteams = 0;
 -                      bprint("^1The teams are now unlocked.\n");
 -              }
 -              else
 -                      bprint("That command can only be used in a team-based gamemode.\n");
 -              return;
 -      }
 -      if(argv(0) == "movetoteam") if(argc == 3 || argc == 4) {
 -              //      sv_cmd movetoteam  player_id  team_colour
 -              //      sv_cmd movetoteam  player_id  team_colour  type_of_move
 -
 -              //      type of move
 -              //      0 (00) automove centerprint, admin message
 -              //      1 (01) automove centerprint, no admin message
 -              //      2 (10) no centerprint, admin message
 -              //      3 (11) no centerprint, no admin message
 -
 -              if(!teamplay) {  // death match
 -                      print("Currently not playing a team game\n");
 +              case GC_REQUEST_HELP:
 +                      print("  ^2defer_clear_all^7: Clear all queued defer commands for all clients\n");
                        return;
 -              }
 -
 -              entno = stof(argv(1));
 -
 -              // player_id is out of range
 -              if((entno < 1) | (entno > maxclients)) {
 -                      print("Player ", argv(1), " doesn't exist\n");
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      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) { bprint(strcat("Successfully stuffed defer clear to all clients (", ftos(i), ")\n")); } // should a message be added if no players were found? 
                        return;
 -              }
 -
 -              client = edict_num(entno);
 -
 -              // player entity is not a client
 -              if not(client.flags & FL_CLIENT) {
 -                      print("Player ", argv(1), " doesn't exist\n");
 +              
 +              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;
 -              }
 -
 -              // find the team to move the player to
 -              float team_colour;
 -              float save;
 -
 -              save = client.team_forced;
 -              client.team_forced = 0;
 -
 -              team_colour = ColourToNumber(argv(2));
 +      }
 +}
  
 -              if(team_colour == client.team) {  // player already on the team
 -                      print("Player ", argv(1), " (", client.netname, ") is already on the ", ColoredTeamName(client.team), "\n");
 -                      // keep the forcing undone
 +void GameCommand_delrec(float request, float argc) // UNTESTED // perhaps merge later with records and printstats and such?
 +{
 +      switch(request)
 +      {
 +              case GC_REQUEST_HELP:
 +                      print("  ^2delrec^7: Delete race time record for a map\n");
                        return;
 -              } else if(team_colour == 0)  // auto team
 -                      team_colour = NumberToTeamNumber(FindSmallestTeam(client, FALSE));
 -              else
 -                      CheckAllowedTeams(client);
 -
 -              client.team_forced = save;
 -
 -              switch(team_colour) {
 -                      case COLOR_TEAM1:
 -                              if(c1 == -1) {
 -                                      print("Sorry, there isn't a red team\n");
 -                                      return;
 -                              }
 -                              break;
 -
 -                      case COLOR_TEAM2:
 -                              if(c2 == -1) {
 -                                      print("Sorry, there isn't a blue team\n");
 -                                      return;
 -                              }
 -                              break;
 -
 -                      case COLOR_TEAM3:
 -                              if(c3 == -1) {
 -                                      print("Sorry, there isn't a yellow team\n");
 -                                      return;
 -                              }
 -                              break;
 -
 -                      case COLOR_TEAM4:
 -                              if(c4 == -1) {
 -                                      print("Sorry, there isn't a pink team\n");
 -                                      return;
 -                              }
 -                              break;
 -
 -                      default:
 -                              print("Sorry, team ", argv(2), " doesn't exist\n");
 +                      
 +              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;
 -              }
 -              print("Player ", argv(1), " (", client.netname, ") has been moved to the ", ColoredTeamName(team_colour), "\n");
 -
 -              client.team_forced = 0;
 -              MoveToTeam(client, team_colour, 6, stof(argv(3)));
 -
 -              return;
 -      }
 -      if (argv(0) == "teamstatus")
 -      {
 -              Score_NicePrint(world);
 -              return;
 -      }
 -      if (argv(0) == "allready")
 -      {
 -              ReadyRestart();
 -              return;
 -      }
 -      if (argv(0) == "effectindexdump")
 -      {
 -              EffectIndexDump();
 -              return;
 -      }
 -      if (argv(0) == "radarmap")
 -      {
 -              RadarMap(argc);
 -              return;
 -      }
 -      if (argv(0) == "bbox")
 -      {
 -              BBox();
 -              return;
 -      }
 -      if (argv(0) == "cvar_changes")
 -      {
 -              print(cvar_changes);
 -              return;
 -      }
 -      if (argv(0) == "cvar_purechanges")
 -      {
 -              print(cvar_purechanges);
 -              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;
        }
 -      if (argv(0) == "find") if(argc == 2)
 +}
 +
 +void GameCommand_effectindexdump(float request)
 +{
 +      float fh, d;
 +      string s;
 +      
 +      switch(request)
        {
 -              for(client = world; (client = find(client, classname, argv(1))); )
 -                      print(etos(client), "\n");
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2effectindexdump^7: Dump list of effects from code and effectinfo.txt\n");
 +                      return;
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      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(s); // tokenize_console would hit the loop counter :(
 +                              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;
        }
 -      if (argv(0) == "records")
 +}
 +
 +void GameCommand_extendmatchtime(float request)
 +{
 +      switch(request)
        {
 -              for (i = 0; i < 10; ++i)
 -                      print(records_reply[i]);
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2extendmatchtime^7: Increase the timelimit value incrementally\n");
 +                      return;
 +                      
 +              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;
        }
 -      if (argv(0) == "ladder")
 +}
 +
 +void GameCommand_find(float request, float argc)
 +{
 +      entity client;
 +      
 +      switch(request)
        {
 -              print(ladder_reply);
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2find^7: Search through entities for matching classname\n");
 +                      return;
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      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;
        }
 -      if (argv(0) == "rankings")
 +}
 +
 +void GameCommand_gametype(float request, float argc)
 +{
 +      string s = argv(1);
 +      float t = MapInfo_Type_FromString(s), tsave = MapInfo_CurrentGametype();
 +      
 +      switch(request)
        {
 -              strunzone(rankings_reply);
 -              rankings_reply = strzone(getrankings());
 -              print(rankings_reply);
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2gametype^7: Simple command to change the active gametype\n");
 +                      return;
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      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;
        }
 +}
  
 -      if(argv(0) == "cointoss")
 +void GameCommand_gettaginfo(float request, float argc) // UNTESTED // todo: finish usage description for it (but, must first learn this shit)
 +{
 +      entity tmp_entity;
 +      float i;
 +      vector v;
 +      
 +      switch(request)
        {
 -              bprint("^3Throwing coin... Result: ");
 -              if (random() > 0.5)
 -                      bprint("^1heads ^3!\n");
 -              else
 -                      bprint("^1tails ^3!\n");
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2gettaginfo^7: Get specific information about a weapon model\n");
 +                      return;
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      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;
        }
 +}
  
 -      if(argv(0) == "__FORCE_READY_RESTART")
 +void GameCommand_gotomap(float request, float argc)
 +{
 +      switch(request)
        {
 -              reset_map(FALSE);
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2gotomap^7: Simple command to switch to another map\n");
 +                      return;
 +                      
 +              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;
        }
 +}
  
 -      if(argv(0) == "debug_shotorg")
 +void GameCommand_ladder(float request)
 +{
 +      switch(request)
        {
 -              debug_shotorg = stov(argv(1));
 -              debug_shotorg_y = -debug_shotorg_y;
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2ladder^7: Get information about top players if supported\n");
 +                      return;
 +                      
 +              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;
        }
 +}
  
 -      if(argv(0) == "gettaginfo") if(argc >= 4)
 +void GameCommand_lockteams(float request)
 +{
 +      switch(request)
        {
 -              e = spawn();
 -              if(argv(1) == "w")
 -                      setmodel(e, (nextent(world)).weaponentity.model);
 -              else
 -              {
 -                      precache_model(argv(1));
 -                      setmodel(e, argv(1));
 -              }
 -              e.frame = stof(argv(2));
 -              if(substring(argv(3), 0, 1) == "#")
 -                      i = stof(substring(argv(3), 1, -1));
 -              else
 -                      i = gettagindex(e, argv(3));
 -              if(i)
 -              {
 -                      v = gettaginfo(e, i);
 -                      print("model ", e.model, " frame ", ftos(e.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)
 +              case GC_REQUEST_HELP:
 +                      print("  ^2lockteams^7: Disable the ability for players to switch or enter teams\n");
 +                      return;
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      if(teamplay)
                        {
 -                              v_y = -v_y;
 -                              localcmd(strcat(argv(4), vtos(v), argv(5), "\n"));
 +                              lockteams = 1;
 +                              bprint("^1The teams are now locked.\n");
                        }
 -              }
 -              else
 -                      print("bone not found\n");
 -              remove(e);
 -              return;
 +                      else
 +                              bprint("That 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;
        }
 +}
  
 -      if(argv(0) == "time")
 +void GameCommand_make_mapinfo(float request) // UNTESTED
 +{
 +      entity tmp_entity;
 +      
 +      switch(request)
        {
 -              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");
 -              print("gmtime = ", strftime(FALSE, "%a %b %e %H:%M:%S %Z %Y"), "\n");
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2make_mapinfo^7: Automatically rebuild mapinfo files\n");
 +                      return;
 +                      
 +              case GC_REQUEST_COMMAND: 
 +                      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;
        }
 +}
  
 -      if(argv(0) == "tracebug")
 +void GameCommand_modelbug(float request) // UNTESTED // is this even needed anymore? 
 +{
 +      switch(request)
        {
 -              print("TEST CASE. If this returns the runaway loop counter error, possibly everything is oaky.\n");
 -              for(;;)
 -              {
 -                      vector org, delta, start, end, p, q, q0, pos;
 -                      float safe, unsafe, dq, dqf;
 -
 -                      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));
 +              case GC_REQUEST_HELP:
 +                      print("  ^2modelbug^7: foobar\n");
 +                      return;
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      modelbug();
 +                      return;
 +                      
 +              default:
 +              case GC_REQUEST_USAGE:
 +                      print("\nUsage:^3 sv_cmd modelbug\n");
 +                      print("  No arguments required.\n");
 +                      return;
 +      }
 +}
  
 -                      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)
 +void GameCommand_moveplayer(float request, float argc)
 +{
 +      entity client;
 +      string targets = argv(1);
 +      string destination = argv(2);
 +      string notify = argv(3);
 +      float i;
 +      argc = tokenizebyseparator(targets, ","); // re-use argc for the targets
 +      
 +      switch(request)
 +      {
 +              case GC_REQUEST_HELP:
 +                      print("  ^2moveplayer^7: Change the team/status of a player\n");
 +                      return;
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      // lets see if the target(s) even actually exist.
 +                      if((targets) && (destination))
 +                      { 
 +                              for(i = 0; i < argc; ++i)
                                {
 -                                      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)
 +                                      // Check to see if the player is a valid target
 +                                      if((stof(argv(i)) < 1) | (stof(argv(i)) > maxclients)) // player_id is out of range
 +                                      {
 +                                              print(strcat("Player ", argv(i), " doesn't exist", (((i + 1) < argc) ? ", skipping to next player.\n" : ".\n")));
 +                                              continue; 
 +                                      }
 +                                      client = edict_num(stof(argv(i)));
 +                                      if not(client.flags & FL_CLIENT) // player entity is not a client
 +                                      {
 +                                              print(strcat("Player ", argv(i), " doesn't exist", (((i + 1) < argc) ? ", 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();
 +                                              }
 +                                              else
 +                                              {
 +                                                      print("Player ", argv(i), " (", client.netname, ") is already spectating.\n");
 +                                              }
 +                                              return;
 +                                      }
 +                                      else
                                        {
 -                                              // how much do we need to back off?
 -                                              safe = 1;
 -                                              unsafe = 0;
 -                                              for(;;)
 +                                              if(client.classname != "spectator" && client.classname != "observer")
                                                {
 -                                                      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(teamplay)
                                                        {
 -                                                              if((safe + unsafe) * 0.5 == unsafe)
 -                                                                      break;
 -                                                              unsafe = (safe + unsafe) * 0.5;
 +                                                              // 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 ", argv(i), " (", client.netname, ") is already on the ", ColoredTeamName(client.team), ".\n");
 +                                                                      return;
 +                                                              } 
 +                                                              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));
 +                                                              print("Player ", argv(i), " (", client.netname, ") has been moved to the ", ColoredTeamName(team_color), ".\n");
 +                                                              return;
                                                        }
                                                        else
                                                        {
 -                                                              if((safe + unsafe) * 0.5 == safe)
 -                                                                      break;
 -                                                              safe = (safe + unsafe) * 0.5;
 +                                                              print("Can't change teams when currently not playing a team game.\n");
 +                                                              return;
                                                        }
                                                }
 -
 -                                              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;
 +                                              {
 +                                                      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;
 +                                              }
                                        }
                                }
 +                              print("No acceptable players given, aborting.\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^7\n");
 +                      return;
        }
 +}
  
 -      if(argv(0) == "tracebug2")
 +void GameCommand_nospectators(float request)
 +{
 +      switch(request)
        {
 -              e = nextent(world);
 -              float f;
 -              vector vv, dv;
 -              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");
 +              case GC_REQUEST_HELP:
 +                      print("  ^2nospectators^7: Automatically remove spectators from a match\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)
 +                      
 +              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
                        {
 -                              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;
 +                              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"));
 +                              }
                        }
 -              }
 -              print("highest possible dist: ", ftos(f), "\n");
 -              return;
 -      }
 -
 -      if(argv(0) == "tracewalk")
 -      {
 -              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;
 +                      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;
        }
 +}
  
 -      if(argv(0) == "onslaught_updatelinks")
 +void GameCommand_onslaught_updatelinks(float request) // UNTESTED // should this be here? Perhaps some mutatorhook call instead....
 +{
 +      switch(request)
        {
 -              onslaught_updatelinks();
 -              print("ONS links updated\n");
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2onslaught_updatelinks^7: Refresh link status for onslaught\n");
 +                      return;
 +                      
 +              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;
        }
 +}
  
 -      if(argv(0) == "bot_cmd")
 +void GameCommand_playerdemo(float request, float argc) // UNTESTED // TODO: change the if statements for sub arguments to switches
 +{
 +      entity client;
 +      float i, n, entno;
 +      string s;
 +      
 +      switch(request)
        {
 -              local entity bot;
 -
 -              if(argv(1) == "help")
 -              {
 -                      if(argc==2)
 +              case GC_REQUEST_HELP:
 +                      print("  ^2playerdemo^7: Control the ability to save demos of players\n");
 +                      return;
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      if(argv(1) == "read")
                        {
 -                              bot_list_commands();
 -                              print("\nsv_cmd bot_cmd reset          #Clear the cmd queues of all bots\n");
 -                              print("sv_cmd bot_cmd load <file>    #Load script file\n");
 -                              print("\nUse sv_cmd bot_cmd help <command> for more\n\n");
 +                              // TODO: Create a general command for looking this up, save a lot of space everywhere in this file
 +                              entno = stof(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;
                        }
 -
 -                      bot_cmdhelp(argv(2));
 -                      return;
 -              }
 -
 -              // Clear all bot queues
 -              if(argv(1) == "reset")
 -              {
 -                      bot_resetqueues();
 -                      return;
 -              }
 -
 -              // Load cmds from file
 -              if(argv(1) == "load" && argc == 3)
 -              {
 -                      float fh;
 -                      fh = fopen(argv(2), FILE_READ);
 -                      if(fh < 0)
 +                      else if(argv(1) == "write")
                        {
 -                              print("cannot open the file\n");
 +                              entno = stof(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;
                        }
 -
 -                      i = 0;
 -                      while((s = fgets(fh)))
 +                      else if(argv(1) == "auto_read_and_write")
                        {
 -                              argc = tokenize_console(s);
 -
 -                              if(argc >= 3 && argv(0) == "sv_cmd" && argv(1) == "bot_cmd")
 -                              {
 -                                      // let's start at token 2 so we can skip sv_cmd bot_cmd
 -                                      bot = find_bot_by_number(stof(argv(2)));
 -                                      if(bot == world)
 -                                              bot = find_bot_by_name(argv(2));
 -                                      if(bot)
 -                                              bot_queuecommand(bot, strcat(argv(3), " ", argv(4)));
 -                              }
 -                              else
 -                                      localcmd(strcat(s, "\n"));
 -
 -                              ++i;
 +                              s = argv(2);
 +                              n = stof(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;
 +                      }
 +                      else if(argv(1) == "auto_read")
 +                      {
 +                              s = argv(2);
 +                              n = stof(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;
                        }
 -
 -                      print(ftos(i), " commands read\n");
 -
 -                      fclose(fh);
 -
                        return;
 -              }
 -
 -              if(argc < 3)
 -              {
 -                      print("Usage: sv_cmd bot_cmd <bot name or number> <command> [argument]\n");
 -                      print("Examples: bot_cmd <id> cc \"say something\"\n");
 -                      print("          bot_cmd <id> presskey jump\n");
 -                      print("          .. or sv_cmd bot_cmd help <command> for more\n");
 +                      
 +              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;
 -              }
 -
 -              bot = find_bot_by_number(stof(argv(1)));
 -              if(bot == world)
 -                      bot = find_bot_by_name(argv(1));
 -
 -              if(bot)
 -                      bot_queuecommand(bot, strcat(argv(2), " ", argv(3)));
 -              else
 -                      print(strcat("Error: Unable to find a bot with the name or number '",argv(1),"'\n"));
 +      }
 +}
  
 -              return;
 +void GameCommand_printstats(float request)
 +{
 +      switch(request)
 +      {
 +              case GC_REQUEST_HELP:
 +                      print("  ^2printstats^7: foobar\n");
 +                      return;
 +                      
 +              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;
        }
 +}
  
 -      if(argv(0) == "playerdemo")
 +void GameCommand_radarmap(float request, float argc)
 +{
 +      float i;
 +      
 +      switch(request)
        {
 -              if(argv(1) == "read")
 -              {
 -                      entno = stof(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));
 +              case GC_REQUEST_HELP:
 +                      print("  ^2radarmap^7: Generate a radar image of the map\n");
                        return;
 -              }
 -              else if(argv(1) == "write")
 -              {
 -                      entno = stof(argv(2));
 -                      if((entno < 1) | (entno > maxclients)) {
 -                              print("Player ", argv(2), " doesn't exist\n");
 -                              return;
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      if(!radarmapper)
 +                      {
 +                              radarmapper = spawn();
 +                              radarmapper.classname = "radarmapper";
 +                              radarmapper.think = RadarMap_Think;
 +                              radarmapper.nextthink = time;
 +                              radarmapper.count = 8; // default to the --trace method, as it is faster now
 +                              radarmapper.ltime = 1;
 +                              radarmapper.size = '512 512 1';
 +
 +                              for(i = 1; i < argc; ++i)
 +                              {
 +                                      switch(argv(i))
 +                                      {
 +                                              case "--force": { radarmapper.count |= 1; break; }
 +                                              case "--loop": { radarmapper.count |= 2; break; }
 +                                              case "--quit": { radarmapper.count |= 4; break; }
 +                                              case "--block": { radarmapper.count &~= 24; break; }
 +                                              case "--trace": { radarmapper.count &~= 24; radarmapper.count |= 8; break; }
 +                                              case "--sample": { radarmapper.count &~= 24; radarmapper.count |= 16; break; }
 +                                              case "--lineblock": { radarmapper.count |= 24; break; }
 +                                              case "--flags": { ++i; radarmapper.count = stof(argv(i)); break; } // for the recursive call
 +                                              case "--sharpen": { ++i; radarmapper.ltime = stof(argv(i)); break; } // for the recursive call
 +                                              case "--res": // minor alias
 +                                              case "--resolution": { ++i; radarmapper.size_x = stof(argv(i)); ++i; radarmapper.size_y = stof(argv(i)); break; }
 +                                              case "--qual": // minor alias
 +                                              case "--quality": { ++i; radarmapper.size_z = stof(argv(i)); break; }
 +                                              
 +                                              default: 
 +                                                      i = argc; 
 +                                                      remove(radarmapper);
 +                                                      radarmapper = world;
 +                                                      break;
 +                                      }
 +                              }
 +                              
 +                              if(radarmapper) // after doing the arguments, see if we successfully went forward. 
 +                              {
 +                                      print("Radarmap entity spawned.\n");
 +                                      return; // if so, don't print usage.
 +                              }
                        }
 -                      client = edict_num(entno);
 -                      self = client;
 -                      playerdemo_open_write(argv(3));
 +                      
 +              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;
 -              }
 -              else if(argv(1) == "auto_read_and_write")
 -              {
 -                      s = argv(2);
 -                      n = stof(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");
 +      }
 +}
 +
 +void GameCommand_rankings(float request) // this is OLD.... jeez.
 +{
 +      switch(request)
 +      {
 +              case GC_REQUEST_HELP:
 +                      print("  ^2rankings^7: Print information about rankings\n");
                        return;
 -              }
 -              else if(argv(1) == "auto_read")
 -              {
 -                      s = argv(2);
 -                      n = stof(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");
 +                      
 +              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;
 -              }
        }
 +}
  
 -      if(argv(0) == "anticheat")
 +void GameCommand_records(float request)
 +{
 +      float i;
 +      
 +      switch(request)
        {
 -              entno = stof(argv(1));
 -              if((entno < 1) | (entno > maxclients)) {
 -                      print("Player ", argv(1), " doesn't exist\n");
 +              case GC_REQUEST_HELP:
 +                      print("  ^2records^7: List top 10 records for the current map\n");
                        return;
 -              }
 -              client = edict_num(entno);
 -              if(clienttype(client) != CLIENTTYPE_REAL && clienttype(client) != CLIENTTYPE_BOT) {
 -                      print("Player ", client.netname, " is not active\n");
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      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;
 -              }
 -              self = client;
 -              anticheat_report();
 -              return;
        }
 +}
  
 -      if(argv(0) == "defer_clear")
 -      if(argc == 2)
 +void GameCommand_reducematchtime(float request)
 +{
 +      switch(request)
        {
 -              entno = stof(argv(1));
 -
 -              // player_id is out of range
 -              if((entno < 1) | (entno > maxclients)) {
 -                      print("Player ", argv(1), " doesn't exist\n");
 +              case GC_REQUEST_HELP:
 +                      print("  ^2reducematchtime^7: Decrease the timelimit value incrementally\n");
                        return;
 -              }
 -
 -              client = edict_num(entno);
 -
 -              if not(client.flags & FL_CLIENT) {
 -                      print("Player ", argv(1), " doesn't exist\n");
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      changematchtime(autocvar_timelimit_decrement*-60, autocvar_timelimit_min*60, autocvar_timelimit_max*60);
                        return;
 -              }
 -
 -              if(clienttype(client) == CLIENTTYPE_BOT) {
 -                      print("Player ", argv(1), " (", client.netname, ") is a bot\n");
 +                      
 +              default:
 +              case GC_REQUEST_USAGE:
 +                      print("\nUsage:^3 sv_cmd reducematchtime\n");
 +                      print("  No arguments required.\n");
 +                      print("See also: ^2extendmatchtime^7\n");
                        return;
 -              }
 -
 -              stuffcmd(client, "defer clear\n");
 -              print("defer clear stuffed to ", argv(1), " (", client.netname, ")\n");
 -              return;
        }
 +}
  
 -      if(argv(0) == "defer_clear_all")
 +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.
 +      
 +      entity client;
 +      float entno;
 +      
 +      #ifdef STUFFTO_ENABLED
 +      switch(request)
        {
 -              FOR_EACH_CLIENTSLOT(client)
 -                      GameCommand(strcat("defer_clear ", ftos(num_for_edict(client))));       
 -
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2stuffto^7: Send a command to be executed on a client\n");
 +                      return;
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      if(argc == 3)
 +                      {
 +                              entno = stof(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;
        }
 -      if(argv(0) == "delrec")
 +      #else // give the response for missing command to fake them out ;3
 +      if(request == GC_REQUEST_COMMAND)
        {
 -              if(argv(2) != "")
 -                      race_deleteTime(argv(2), stof(argv(1)));
 -              else
 -                      race_deleteTime(GetMapname(), stof(argv(1)));
 -
 +              print("Invalid command. For a list of supported commands, try sv_cmd help.\n");
                return;
        }
 +      #endif
 +}
  
 -      if(argv(0) == "showtraceline")
 +void GameCommand_teamstatus(float request)
 +{
 +      switch(request)
        {
 -              vector src, dst;
 -              src = stov(argv(1));
 -              dst = stov(argv(2));
 -              traceline(src, dst, MOVE_NORMAL, world);
 -              trailparticles(world, particleeffectnum("TR_NEXUIZPLASMA"), src, trace_endpos);
 -              trailparticles(world, particleeffectnum("TR_CRYLINKPLASMA"), trace_endpos, dst);
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2teamstatus^7: Show information about player and team scores\n");
 +                      return;
 +                      
 +              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;
        }
 +}
  
 -      if(argv(0) == "extendmatchtime")
 +void GameCommand_time(float request)
 +{
 +      switch(request)
        {
 -              changematchtime(autocvar_timelimit_increment* 60, autocvar_timelimit_min*60, autocvar_timelimit_max*60);
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2time^7: Print different formats/readouts of time\n");
 +                      return;
 +                      
 +              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;
        }
 +}
  
 -      if(argv(0) == "reducematchtime")
 +void GameCommand_trace(float request, float argc)
 +{
 +      entity e;
 +      vector org, delta, start, end, p, q, q0, pos, vv, dv;
 +      float i, f, safe, unsafe, dq, dqf;
 +      
 +      // TODO: Clean up all of these variables and merge the code below to use only a few
 +                                              
 +      switch(request)
        {
 -              changematchtime(autocvar_timelimit_decrement*-60, autocvar_timelimit_min*60, autocvar_timelimit_max*60);
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2trace^7: Various debugging tools with tracing\n");
 +                      return;
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      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 arguments"
 +                      }
 +                      
 +              default:
 +              case GC_REQUEST_USAGE:
 +                      print("\nUsage:^3 sv_cmd trace command [arguments]\n");
 +                      print("  FIXME: Arguments currently unknown\n");
 +                      return;
        }
 +}
  
 -      if(argv(0) == "modelbug")
 +void GameCommand_unlockteams(float request)
 +{
 +      switch(request)
        {
 -              modelbug();
 -              return;
 +              case GC_REQUEST_HELP:
 +                      print("  ^2unlockteams^7: Enable the ability for players to switch or enter teams\n");
 +                      return;
 +                      
 +              case GC_REQUEST_COMMAND:
 +                      if(teamplay)
 +                      {
 +                              lockteams = 0;
 +                              bprint("^1The teams are now unlocked.\n");
 +                      }
 +                      else
 +                              bprint("That 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;
        }
 +}
  
 -      if(argv(0) == "warp")
++void GameCommand_warp(float request, float argc)
++{
++      switch (request)
+       {
 -              if(autocvar_g_campaign)
 -              {
 -                      if(argc >= 2)
 -                              CampaignLevelWarp(stof(argv(1)));
++              case GC_REQUEST_HELP:
++                      print("  ^2warp^7: Choose different level in campaign\n");
++                      return;
++              
++              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
 -                              CampaignLevelWarp(-1);
 -              }
 -              else
 -                      print("Not in campaign, can't level warp\n");
++                              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;
+       }
 -
 -      print("Invalid command. For a list of supported commands, try sv_cmd help.\n");
+ }
 +
 +// =========================================
 +//  Main Function Called By Engine (sv_cmd)
 +// =========================================
 +// If this function exists, game code handles gamecommand instead of the engine code.
 +
 +void GameCommand(string command)
 +{
 +      // ===== TODO list =====
 +      // find all FIXME's and TODO'S and UNTESTED'S and finish them :P
 +
 +      float search_request_type;
 +      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_adminmsg(GC_REQUEST_HELP, 0);
 +                      GameCommand_allready(GC_REQUEST_HELP);
 +                      GameCommand_allspec(GC_REQUEST_HELP, 0);
 +                      GameCommand_anticheat(GC_REQUEST_HELP, 0);
 +                      GameCommand_bbox(GC_REQUEST_HELP);
 +                      GameCommand_bot_cmd(GC_REQUEST_HELP, 0);
 +                      GameCommand_cointoss(GC_REQUEST_HELP, 0);
 +                      GameCommand_cvar_changes(GC_REQUEST_HELP);
 +                      GameCommand_cvar_purechanges(GC_REQUEST_HELP);
 +                      GameCommand_database(GC_REQUEST_HELP, 0);
 +                      GameCommand_defer_clear(GC_REQUEST_HELP, 0);
 +                      GameCommand_defer_clear_all(GC_REQUEST_HELP);
 +                      GameCommand_delrec(GC_REQUEST_HELP, 0);
 +                      GameCommand_effectindexdump(GC_REQUEST_HELP);
 +                      GameCommand_extendmatchtime(GC_REQUEST_HELP);
 +                      GameCommand_find(GC_REQUEST_HELP, 0);
 +                      GameCommand_gametype(GC_REQUEST_HELP, 0);
 +                      GameCommand_gettaginfo(GC_REQUEST_HELP, 0);
 +                      GameCommand_gotomap(GC_REQUEST_HELP, 0);
 +                      GameCommand_ladder(GC_REQUEST_HELP);
 +                      GameCommand_lockteams(GC_REQUEST_HELP);
 +                      GameCommand_make_mapinfo(GC_REQUEST_HELP);
 +                      GameCommand_modelbug(GC_REQUEST_HELP);
 +                      GameCommand_moveplayer(GC_REQUEST_HELP, 0);
 +                      GameCommand_nospectators(GC_REQUEST_HELP);
 +                      GameCommand_onslaught_updatelinks(GC_REQUEST_HELP);
 +                      GameCommand_playerdemo(GC_REQUEST_HELP, 0);
 +                      GameCommand_printstats(GC_REQUEST_HELP);
 +                      GameCommand_radarmap(GC_REQUEST_HELP, 0);
 +                      GameCommand_rankings(GC_REQUEST_HELP);
 +                      GameCommand_records(GC_REQUEST_HELP);
 +                      GameCommand_reducematchtime(GC_REQUEST_HELP);
 +                      GameCommand_stuffto(GC_REQUEST_HELP, 0);
 +                      GameCommand_teamstatus(GC_REQUEST_HELP);
 +                      GameCommand_time(GC_REQUEST_HELP);
 +                      GameCommand_trace(GC_REQUEST_HELP, 0);
 +                      GameCommand_unlockteams(GC_REQUEST_HELP);
++                      GameCommand_warp(GC_REQUEST_HELP, 0);
 +                      GameCommand_Vote("help", world);
 +                      GameCommand_Ban("help");
 +                      GameCommand_Generic("help");
 +                      print("For help about specific commands, type sv_cmd help COMMAND\n");
 +                      return;
 +              } 
 +              else
 +                      search_request_type = GC_REQUEST_USAGE; // Instead of trying to call a command, we're going to see detailed information about it
 +      } 
 +      else if(GameCommand_Vote(command, world)) 
 +      {
 +              return; // handled by server/vote.qc 
 +      }
 +      else if(GameCommand_Ban(command)) 
 +      {
 +              return; // handled by server/ipban.qc
 +      }
 +      else if(GameCommand_Generic(command)) 
 +      {
 +              return; // handled by common/gamecommand.qc
 +      }
 +      else
 +              search_request_type = GC_REQUEST_COMMAND; // continue as usual and scan for normal commands
 +              
 +      switch(strtolower((search_request_type == GC_REQUEST_USAGE) ? argv(1) : argv(0))) // if first argument is help, then search for the second argument. Else, search for first. 
 +      {
 +              // Do not hard code aliases for these, instead create them in defaultXonotic.cfg
 +              // also: keep in alphabetical order, please ;)
 +              
 +              case "adminmsg": GameCommand_adminmsg(search_request_type, argc); break;
 +              case "allready": GameCommand_allready(search_request_type); break;
 +              case "allspec": GameCommand_allspec(search_request_type, argc); break;
 +              case "anticheat": GameCommand_anticheat(search_request_type, argc); break;
 +              case "bbox": GameCommand_bbox(search_request_type); break;
 +              case "bot_cmd": GameCommand_bot_cmd(search_request_type, argc); break;
 +              case "cointoss": GameCommand_cointoss(search_request_type, argc); break; 
 +              case "cvar_changes": GameCommand_cvar_changes(search_request_type); break; 
 +              case "cvar_purechanges": GameCommand_cvar_purechanges(search_request_type); break; 
 +              case "database": GameCommand_database(search_request_type, argc); break;
 +              case "defer_clear": GameCommand_defer_clear(search_request_type, argc); break;
 +              case "defer_clear_all": GameCommand_defer_clear_all(search_request_type); break;
 +              case "delrec": GameCommand_delrec(search_request_type, argc); break;
 +              case "effectindexdump": GameCommand_effectindexdump(search_request_type); break;
 +              case "extendmatchtime": GameCommand_extendmatchtime(search_request_type); break;
 +              case "find": GameCommand_find(search_request_type, argc); break; 
 +              case "gametype": GameCommand_gametype(search_request_type, argc); break;
 +              case "gettaginfo": GameCommand_gettaginfo(search_request_type, argc); break;
 +              case "gotomap": GameCommand_gotomap(search_request_type, argc); break;
 +              case "ladder": GameCommand_ladder(search_request_type); break;
 +              case "lockteams": GameCommand_lockteams(search_request_type); break;
 +              case "make_mapinfo": GameCommand_make_mapinfo(search_request_type); break;
 +              case "modelbug": GameCommand_modelbug(search_request_type); break;
 +              case "moveplayer": GameCommand_moveplayer(search_request_type, argc); break;
 +              case "nospectators": GameCommand_nospectators(search_request_type); break;
 +              case "onslaught_updatelinks": GameCommand_onslaught_updatelinks(search_request_type); break;
 +              case "playerdemo": GameCommand_playerdemo(search_request_type, argc); break;
 +              case "printstats": GameCommand_printstats(search_request_type); break;
 +              case "radarmap": GameCommand_radarmap(search_request_type, argc); break;
 +              case "rankings": GameCommand_rankings(search_request_type); break;
 +              case "records": GameCommand_records(search_request_type); break;
 +              case "reducematchtime": GameCommand_reducematchtime(search_request_type); break;
 +              case "stuffto": GameCommand_stuffto(search_request_type, argc); break;
 +              case "teamstatus": GameCommand_teamstatus(search_request_type); break;
 +              case "time": GameCommand_time(search_request_type); break;
 +              case "trace": GameCommand_trace(search_request_type, argc); break;
 +              case "unlockteams": GameCommand_unlockteams(search_request_type); break;
++              case "warp": GameCommand_warp(search_request_type, argc); break;
 +              
 +              default:
 +                      print("Invalid command. For a list of supported commands, try sv_cmd help.\n");
 +      }
 +}