]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Thu, 4 Aug 2011 17:53:53 +0000 (13:53 -0400)
committerSamual <samual@xonotic.org>
Thu, 4 Aug 2011 17:53:53 +0000 (13:53 -0400)
Conflicts:
qcsrc/server/clientcommands.qc

1  2 
defaultXonotic.cfg
qcsrc/server/clientcommands.qc

diff --combined defaultXonotic.cfg
index c4611d77ec5774664b709a6451f82e1eb87f2a4d,58d54e41d092d5ec4660397f76863d513f1b33b1..36d6aecd59e9690a773665a545e90c423c4ad33e
@@@ -69,11 -69,6 +69,11 @@@ alias rec "record demos/$1
  alias ply "playdemo $1"
  alias tdem "timedemo $1"
  
 +// for backwards compatibility
 +alias savedb "sv_cmd database save \"$1\""
 +alias dumpdb "sv_cmd database dump \"$1\""
 +alias loaddb "sv_cmd database load \"$1\""
 +
  alias dropweapon "impulse 17"
  alias +show_info +button7
  alias -show_info -button7
@@@ -707,7 -702,7 +707,7 @@@ set g_ctf_flagcarrier_selfforce 
  set g_ctf_fullbrightflags 0
  set g_ctf_dynamiclights 0
  set g_ctf_allow_drop 1        "dropping allows circumventing carrierkill score, so enable this with care!"
- set g_ctf_reverse 0   "when 1, bases/flags are switched :P you have to capture your OWN flag by bringing it to the ENEMY's"
+ set g_ctf_reverse 0   "if enabled, flags positions are switched: you have to capture the enemy's flag from your own base by bringing it to your own flag in the enemy base"
  set g_balance_ctf_delay_collect 1.0
  set g_balance_ctf_damageforcescale 1
  
@@@ -1273,7 -1268,7 +1273,7 @@@ alias "g_waypointsprite_team_danger_p"  
  alias "g_waypointsprite_team_danger_d"        "impulse 39"
  alias "g_waypointsprite_clear_personal"       "impulse 47"
  alias "g_waypointsprite_clear"        "impulse 48"
- alias "g_waypointsprite_toggle"       "impulse 49"
+ alias "g_waypointsprite_toggle"       "toggle cl_hidewaypoints"
  // key for that?
  seta cl_hidewaypoints 0 "disable static waypoints, only show team waypoints"
  
index 88672c7e3f619e7bc59b330743a0065c3d762d10,bace1dd7ea26f67dfa2e377c937eebca5e5aee1f..8770f11f715e24bcd9142b19199ec32055afc37b
@@@ -1,55 -1,22 +1,65 @@@
 +// =======================================================
 +//  Server side client commands code, reworked by Samual
 +//  Last updated: July 24th, 2011
 +// =======================================================
 +
 +#define CC_REQUEST_HELP 1
 +#define CC_REQUEST_COMMAND 2
 +#define CC_REQUEST_USAGE 3
 +
  entity nagger;
 +
 +.float cmd_floodtime;
 +.float cmd_floodcount;
 +.float checkfail;
 +
 +float readyrestart_happened;
  float readycount;
  
 +string MapVote_Suggest(string m);
 +
 +void ReadyCount();
 +
 +
 +// ============================
 +//  Misc. Supporting Functions
 +// ============================
 +
 +float SV_ParseClientCommand_floodcheck()
 +{
 +      if (timeoutStatus != 2) // if the game is not paused... but wait, doesn't that mean it could be dos'd by pausing it? eh? (old code)
 +      {
 +              if(time == self.cmd_floodtime) // todo: add buffer time as well, ONLY one second is a short amount of time for someone to be spamming. 
 +              {
 +                      self.cmd_floodcount += 1;
 +                      if(self.cmd_floodcount > 8) // todo: replace constant 8 with a cvar for the server to control
 +                              return FALSE; // too much spam, halt
 +              }
 +              else
 +              {
 +                      self.cmd_floodtime = time;
 +                      self.cmd_floodcount = 1;
 +              }
 +      }
 +      return TRUE; // continue, as we're not flooding yet
 +}
 +
  float Nagger_SendEntity(entity to, float sendflags)
  {
        float nags, i, f, b;
        entity e;
        WriteByte(MSG_ENTITY, ENT_CLIENT_NAGGER);
  
+       // bits:
+       //   1 = ready
+       //   2 = player needs to ready up
+       //   4 = vote
+       //   8 = player needs to vote
+       //  16 = warmup
+       // sendflags:
+       //  64 = vote counts
+       // 128 = vote string
        nags = 0;
        if(readycount)
        {
        if(inWarmupStage)
                nags |= 16;
  
+       if(sendflags & 64)
+               nags |= 64;
        if(sendflags & 128)
                nags |= 128;
  
        if(!(nags & 4)) // no vote called? send no string
-               nags &~= 128;
+               nags &~= (64 | 128);
  
        WriteByte(MSG_ENTITY, nags);
  
-       if(nags & 128)
+       if(nags & 64)
        {
-               WriteString(MSG_ENTITY, votecalledvote_display);
+               WriteByte(MSG_ENTITY, vote_yescount);
+               WriteByte(MSG_ENTITY, vote_nocount);
+               WriteByte(MSG_ENTITY, vote_needed_absolute);
+               WriteChar(MSG_ENTITY, to.vote_vote);
        }
  
+       if(nags & 128)
+               WriteString(MSG_ENTITY, votecalledvote_display);
        if(nags & 1)
        {
                for(i = 1; i <= maxclients; i += 8)
@@@ -104,7 -80,7 +123,7 @@@ void Nagger_VoteChanged(
  void Nagger_VoteCountChanged()
  {
        if(nagger)
-               nagger.SendFlags |= 1;
+               nagger.SendFlags |= 64;
  }
  void Nagger_ReadyCounted()
  {
                nagger.SendFlags |= 1;
  }
  
 -void ReadyCount();
 -string MapVote_Suggest(string m);
 -
 -entity GetPlayer(string name)
 -{
 -      float num;
 -      entity e;
 -      string ns;
 -
 -      if(substring(name, 0, 1) == "#") {
 -              num = stof(substring(name, 1, 999));
 -              if(num >= 1 && num <= maxclients) {
 -                      for((e = world); num > 0; --num, (e = nextent(e)))
 -                              ;
 -                      //if(clienttype(e) == CLIENTTYPE_REAL)
 -                      if(e.classname == "player")
 -                              return e;
 -              }
 -      } else {
 -              ns = strdecolorize(name);
 -              FOR_EACH_REALPLAYER(e) {
 -                      if(!strcasecmp(strdecolorize(e.netname), ns)) {
 -                              return e;
 -                      }
 -              }
 -      }
 -      return world;
 -}
 -
 -//float ctf_clientcommand();
 -float readyrestart_happened;
 -.float lms_spectate_warning;
 -void spawnfunc_func_breakable();
 -
 -.float cmd_floodtime;
 -.float cmd_floodcount;
 -float cmd_floodcheck()
 -{
 -      if (timeoutStatus != 2)
 -      {
 -              if(time == self.cmd_floodtime)
 -              {
 -                      self.cmd_floodcount += 1;
 -                      if(self.cmd_floodcount > 8)
 -                              return TRUE;
 -              }
 -              else
 -              {
 -                      self.cmd_floodtime = time;
 -                      self.cmd_floodcount = 1;
 -              }
 -      }
 -      return FALSE;
 -}
 -
 -.float checkfail;
 -void SV_ParseClientCommand(string s) {
 -      string cmd;
 -      float tokens;
 -      float i;
 -      entity e;
 -
 -      tokens = tokenize_console(s);
 -
 -      cmd = strtolower(argv(0));
 -      if(cmd != "reportcvar")
 -      if(cmd != "sentcvar")
 -      if(cmd != "pause")
 -      if(cmd != "prespawn")
 -      if(cmd != "spawn")
 -      if(cmd != "begin")
 -      {
 -              if(cmd_floodcheck())
 -                      return;
 -      }
 -
 -      if(GameCommand_Vote(s, self)) {
 -              return;
 -      } else if(GameCommand_MapVote(argv(0))) {
 -              return;
 -      } else if(cmd == "checkfail") {
 -              print(sprintf("CHECKFAIL: %s (%s) epically failed check %s\n", self.netname, self.netaddress, substring(s, argv_start_index(1), argv_end_index(-1) - argv_start_index(1))));
 -              self.checkfail = 1;
 -      } else if(cmd == "autoswitch") {
 -              // be backwards compatible with older clients (enabled)
 -              self.autoswitch = ("0" != argv(1));
 -              local string autoswitchmsg;
 -              if (self.autoswitch) {
 -                      autoswitchmsg = "on";
 -              } else {
 -                      autoswitchmsg = "off";
 -              }
 -              sprint(self, strcat("^1autoswitch turned ", autoswitchmsg, "\n"));
 -      } else if(cmd == "clientversion") {
 -              if not(self.flags & FL_CLIENT)
 -                      return;
 -              if (argv(1) == "$gameversion") {
 -                      //versionmsg = "^1client is too old to get versioninfo.\nUPDATE!!! (http://www.xonotic.com)^8";
 -                      // either that or someone wants to be funny
 -                      self.version = 1;
 -              } else {
 -                      self.version = 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";
 -                      stuffcmd(self,"menu_showteamselect\n");
 -              }
 -      } else if(cmd == "reportcvar") { // old system
 -              if(substring(argv(2), 0, 1) == "$") // undefined cvar: use the default value on the server then
 -              {
 -                      s = strcat(substring(s, argv_start_index(0), argv_end_index(1) - argv_start_index(0)), " \"", cvar_defstring(argv(1)), "\"");
 -                      tokens = tokenize_console(s);
 -              }
 -              GetCvars(1);
 -      } else if(cmd == "sentcvar") { // new system
 -              if(tokens == 2) // undefined cvar: use the default value on the server then
 -              {
 -                      s = strcat(substring(s, argv_start_index(0), argv_end_index(1) - argv_start_index(0)), " \"", cvar_defstring(argv(1)), "\"");
 -                      tokens = tokenize_console(s);
 -              }
 -              GetCvars(1);
 -      } else if(cmd == "spectate") {
 -              if(cmd_floodcheck())
 -                      return;
 -              if not(self.flags & FL_CLIENT)
 -                      return;
 -              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
 -              }
 -              if(g_ca && self.caplayer && (self.classname == "spectator" || self.classname == "observer")) {
 -                      // in CA, allow a dead player to move to spectatators (without that, caplayer!=0 will be moved back to the player list)
 -                      sprint(self, "WARNING: you will spectate in the next round.\n");
 -                      self.caplayer = 0;
 -              }
 -      } else if(cmd == "join") {
 -              if not(self.flags & FL_CLIENT)
 -                      return;
 -              if(!g_arena)
 -              if (self.classname != "player" && !lockteams)
 -              {
 -                      if(nJoinAllowed(1)) {
 -                              self.classname = "player";
 -                              if(g_ca)
 -                                      self.caplayer = 1;
 -                              PlayerScore_Clear(self);
 -                              bprint ("^4", self.netname, "^4 is playing now\n");
 -                              PutClientInServer();
 -                              if(autocvar_g_campaign)
 -                                      campaign_bots_may_start = 1;
 -                      }
 -                      else {
 -                              //player may not join because of g_maxplayers is set
 -                              centerprint_atprio(self, CENTERPRIO_MAPVOTE, PREVENT_JOIN_TEXT);
 -                      }
 -              }
 -      } else if( cmd == "selectteam" ) {
 -              if not(self.flags & FL_CLIENT)
 -                      return;
 -              if( !teamplay ) {
 -                      sprint( self, "selectteam can only be used in teamgames\n");
 -              } else if(autocvar_g_campaign) {
 -                      //JoinBestTeam(self, 0);
 -              } else if(self.team_forced > 0) {
 -                      sprint( self, "selectteam can not be used as your team is forced\n");
 -              } else if(lockteams) {
 -                      sprint( self, "^7The game has already begun, you must wait until the next map to be able to join a team.\n");
 -              } else if( argv(1) == "red" ) {
 -                      ClientKill_TeamChange(COLOR_TEAM1);
 -              } else if( argv(1) == "blue" ) {
 -                      ClientKill_TeamChange(COLOR_TEAM2);
 -              } else if( argv(1) == "yellow" ) {
 -                      ClientKill_TeamChange(COLOR_TEAM3);
 -              } else if( argv(1) == "pink" ) {
 -                      ClientKill_TeamChange(COLOR_TEAM4);
 -              } else if( argv(1) == "auto" ) {
 -                      ClientKill_TeamChange(-1);
 -              } else {
 -                      sprint( self, strcat( "selectteam none/red/blue/yellow/pink/auto - \"", argv(1), "\" not recognised\n" ) );
 -              }
 -      } else if(cmd == "ready") {
 -              if not(self.flags & FL_CLIENT)
 -                      return;
 -
 -              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");
 -                      }
 -              }
 -      } else if(cmd == "maplist") {
 -              sprint(self, maplist_reply);
 -      } else if(cmd == "lsmaps") {
 -              sprint(self, lsmaps_reply);
 -      } else if(cmd == "lsnewmaps") {
 -              sprint(self, lsnewmaps_reply);
 -      } else if(cmd == "records") {
 -              for(i = 0; i < 10; ++i)
 -                      sprint(self, records_reply[i]);
 -      } else if(cmd == "ladder") {
 -              sprint(self, ladder_reply);
 -      } else if(cmd == "rankings") {
 -              sprint(self, rankings_reply);
 -      } else if(cmd == "voice") {
 -              if(tokens >= 3)
 -                      VoiceMessage(argv(1), substring(s, argv_start_index(2), argv_end_index(-1) - argv_start_index(2)));
 -              else
 -                      VoiceMessage(argv(1), "");
 -      } else if(cmd == "say") {
 -              if(tokens >= 2)
 -                      Say(self, FALSE, world, substring(s, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1);
 -              //clientcommand(self, formatmessage(s));
 -      } else if(cmd == "say_team") {
 -              if(tokens >= 2)
 -                      Say(self, TRUE, world, substring(s, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1);
 -              //clientcommand(self, formatmessage(s));
 -      } else if(cmd == "tell") {
 -              e = GetCommandPlayerSlotTargetFromTokenizedCommand(tokens, 1);
 -              if(e && tokens > ParseCommandPlayerSlotTarget_firsttoken)
 -              {
 -                      Say(self, FALSE, e, substring(s, argv_start_index(ParseCommandPlayerSlotTarget_firsttoken), argv_end_index(-1) - argv_start_index(ParseCommandPlayerSlotTarget_firsttoken)), TRUE);
 -              }
 -              else
 -              {
 -                      if(tokens > ParseCommandPlayerSlotTarget_firsttoken)
 -                              trigger_magicear_processmessage_forallears(self, -1, world, substring(s, argv_start_index(ParseCommandPlayerSlotTarget_firsttoken), argv_end_index(-1) - argv_start_index(ParseCommandPlayerSlotTarget_firsttoken)));
 -                      sprint(self, "ERROR: usage: tell # playerid text...\n");
 -              }
 -              //clientcommand(self, formatmessage(s));
 -      } else if(cmd == "info") {
 -              cmd = cvar_string_builtin(strcat("sv_info_", argv(1))); // This needed fixed for the cvar check
 -              if(cmd == "")
 -                      sprint(self, "ERROR: unsupported info command\n");
 -              else
 -                      wordwrap_sprint(cmd, 1111);
 -      } else if(cmd == "suggestmap") {
 -              sprint(self, strcat(MapVote_Suggest(argv(1)), "\n"));
 -      } else if(cmd == "timeout") {
 -              if not(self.flags & FL_CLIENT)
 -                      return;
 -              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
 -                                      evaluateTimeout();
 -                      }
 -                      else
 -                              sprint(self, "^7Error: only players can call a timeout!\n");
 -              }
 -      } else if(cmd == "timein") {
 -              if not(self.flags & FL_CLIENT)
 -                      return;
 -              if(autocvar_sv_timeout) {
 -                      evaluateTimein();
 -              }
 -      } else if(cmd == "teamstatus") {
 -              Score_NicePrint(self);
 -      } else if(cmd == "cvar_changes") {
 -              sprint(self, cvar_changes);
 -      } else if(cmd == "cvar_purechanges") {
 -              sprint(self, cvar_purechanges);
 -      } else if(CheatCommand(tokens)) {
 -      } else {
 -#if 0
 -              //if(ctf_clientcommand())
 -              //      return;
 -              // grep for Cmd_AddCommand_WithClientCommand to find them all
 -              if(cmd != "status")
 -              //if(cmd != "say") // handled above
 -              //if(cmd != "say_team") // handled above
 -              if(cmd != "kill")
 -              if(cmd != "pause")
 -              if(cmd != "ping")
 -              if(cmd != "name")
 -              if(cmd != "color")
 -              if(cmd != "rate")
 -              if(cmd != "pmodel")
 -              if(cmd != "playermodel")
 -              if(cmd != "playerskin")
 -              if(cmd != "prespawn")
 -              if(cmd != "spawn")
 -              if(cmd != "begin")
 -              if(cmd != "pings")
 -              if(cmd != "sv_startdownload")
 -              if(cmd != "download")
 -              {
 -                      print("WARNING: Invalid clientcommand by ", self.netname, ": ", s, "\n");
 -                      return;
 -              }
 -#endif
 -
 -              if(self.jointime > 0 && time > self.jointime + 10 && time > self.nickspamtime) // allow any changes in the first 10 seconds since joining
 -              if(cmd == "name" || cmd == "playermodel") // TODO also playerskin and color?
 -              {
 -                      if(self.nickspamtime == 0 || time > self.nickspamtime + autocvar_g_nick_flood_timeout)
 -                              // good, no serious flood
 -                              self.nickspamcount = 1;
 -                      else
 -                              self.nickspamcount += 1;
 -                      self.nickspamtime = time + autocvar_g_nick_flood_penalty;
 -
 -                      if (timeoutStatus == 2) //when game is paused, no flood protection
 -                              self.nickspamcount = self.nickspamtime = 0;
 -              }
 -
 -              clientcommand(self,s);
 -      }
 -}
 -
  void ReadyRestartForce()
  {
        local entity e;
@@@ -315,532 -639,3 +334,532 @@@ void evaluateTimein() 
  
        }
  }
- }
 +
 +
 +// =======================
 +//  Command Sub-Functions
 +// =======================
 +
 +void ClientCommand_autoswitch(float request, entity client, float argc)
 +{
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(client, "  ^2autoswitch^7: Whether or not to switch automatically when getting a better weapon\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      client.autoswitch = ("0" != argv(1));
 +                      sprint(client, strcat("^1autoswitch is currently turned ", (client.autoswitch ? "on" : "off"), ".\n"));
 +                      return; // never fall through to usage
 +                      
 +              default:
 +              case CC_REQUEST_USAGE:
 +                      sprint(client, "\nUsage:^3 cmd autoswitch selection\n");
 +                      sprint(client, "  Where 'selection' is 1 or 0 for on or off.\n"); 
 +                      return;
 +      }
 +}
 +
 +void ClientCommand_checkfail(float request, entity client, string command) // used only by client side code
 +{
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(client, "  ^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", client.netname, client.netaddress, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1))));
 +                      client.checkfail = 1;
 +                      return; // never fall through to usage
 +                      
 +              default:
 +              case CC_REQUEST_USAGE:
 +                      sprint(client, "\nUsage:^3 cmd checkfail message\n");
 +                      sprint(client, "  Where 'message' is the message reported by client about the fail.\n");
 +                      return;
 +      }
 +}
 +
 +void ClientCommand_clientversion(float request, entity client, float argc) // used only by client side code
 +{
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(client, "  ^2clientversion^7: Release version of the game\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      if(client.flags & FL_CLIENT)
 +                      {
 +                              client.version = ((argv(1) == "$gameversion") ? 1 : stof(argv(1)));
 +                              
 +                              if(client.version < autocvar_gameversion_min || client.version > autocvar_gameversion_max)
 +                              {
 +                                      client.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 && !(client.team_forced > 0)) 
 +                              {
 +                                      client.classname = "observer"; // really?
 +                                      stuffcmd(client, "menu_showteamselect\n");
 +                              }
 +                      }
 +                      return; // never fall through to usage
 +                      
 +              default:
 +              case CC_REQUEST_USAGE:
 +                      sprint(client, "\nUsage:^3 cmd clientversion version\n");
 +                      sprint(client, "  Where 'version' is the game version reported by client.\n");
 +                      return;
 +      }
 +}
 +
 +void ClientCommand_cvar_changes(float request, entity client)
 +{
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(client, "  ^2cvar_changes^7: Prints a list of all changed server cvars\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      sprint(client, cvar_changes);
 +                      return; // never fall through to usage
 +                      
 +              default:
 +              case CC_REQUEST_USAGE:
 +                      sprint(client, "\nUsage:^3 sv_cmd cvar_changes\n");
 +                      sprint(client, "  No arguments required.\n");
 +                      //sprint(client, "See also: ^2cvar_purechanges^7\n");
 +                      return;
 +      }
 +}
 +
 +void ClientCommand_cvar_purechanges(float request, entity client)
 +{
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(client, "  ^2cvar_purechanges^7: Prints a list of all changed gameplay cvars\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      sprint(client, cvar_purechanges);
 +                      return; // never fall through to usage
 +                      
 +              default:
 +              case CC_REQUEST_USAGE:
 +                      sprint(client, "\nUsage:^3 sv_cmd cvar_purechanges\n");
 +                      sprint(client, "  No arguments required.\n");
 +                      //sprint(client, "See also: ^2cvar_changes^7\n");
 +                      return;
 +      }
 +}
 +
 +void ClientCommand_info(float request, entity client, float argc)
 +{
 +      string command;
 +      
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(client, "  ^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(client, "ERROR: unsupported info command\n");
 +                      return; // never fall through to usage
 +                      
 +              default:
 +              case CC_REQUEST_USAGE:
 +                      sprint(client, "\nUsage:^3 cmd info request\n");
 +                      sprint(client, "  Where 'request' is the suffixed string appended onto the request for cvar.\n");
 +                      return;
 +      }
 +}
 +
 +void ClientCommand_join(float request, entity client)
 +{
 +      entity oldself;
 +
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(client, "  ^2join^7: Become a player in the game\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      if(client.flags & FL_CLIENT)
 +                      {
 +                              if(client.classname != "player" && !lockteams && !g_arena)
 +                              {
 +                                      if(nJoinAllowed(1)) 
 +                                      {
 +                                              oldself = self;
 +                                              self = client;
 +                                              if(g_ca) { client.caplayer = 1; }
 +                                              if(autocvar_g_campaign) { campaign_bots_may_start = 1; }
 +                                              
 +                                              client.classname = "player";
 +                                              PlayerScore_Clear(client);
 +                                              bprint ("^4", client.netname, "^4 is playing now\n");
 +                                              PutClientInServer();
 +                                              self = oldself;
 +                                      }
 +                                      else 
 +                                      {
 +                                              //player may not join because of g_maxplayers is set
 +                                              centerprint_atprio(client, CENTERPRIO_MAPVOTE, PREVENT_JOIN_TEXT);
 +                                      }
 +                              }
 +                      }
 +                      return; // never fall through to usage
 +                      
 +              default:
 +              case CC_REQUEST_USAGE:
 +                      sprint(client, "\nUsage:^3 cmd join\n");
 +                      sprint(client, "  No arguments required.\n");
 +                      return;
 +      }
 +}
 +
 +void ClientCommand_ladder(float request, entity client)
 +{
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(client, "  ^2ladder^7: Get information about top players if supported\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      sprint(client, ladder_reply);
 +                      return; // never fall through to usage
 +                      
 +              default:
 +              case CC_REQUEST_USAGE:
 +                      sprint(client, "\nUsage:^3 cmd ladder\n");
 +                      sprint(client, "  No arguments required.\n");
 +                      return;
 +      }
 +}
 +
 +void ClientCommand_lsmaps(float request, entity client)
 +{
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(client, "  ^2lsmaps^7: List maps which can be used with the current game mode\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      sprint(client, lsmaps_reply);
 +                      return; // never fall through to usage
 +                      
 +              default:
 +              case CC_REQUEST_USAGE:
 +                      sprint(client, "\nUsage:^3 cmd lsmaps\n");
 +                      sprint(client, "  No arguments required.\n");
 +                      return;
 +      }
 +}
 +
 +void ClientCommand_lsnewmaps(float request, entity client)
 +{
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(client, "  ^2lsnewmaps^7: List maps which TODO\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      sprint(client, lsnewmaps_reply);
 +                      return; // never fall through to usage
 +                      
 +              default:
 +              case CC_REQUEST_USAGE:
 +                      sprint(client, "\nUsage:^3 cmd lsnewmaps\n");
 +                      sprint(client, "  No arguments required.\n");
 +                      return;
 +      }
 +}
 +
 +void ClientCommand_maplist(float request, entity client)
 +{
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(client, "  ^2maplist^7: Full server maplist reply\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      sprint(client, maplist_reply);
 +                      return; // never fall through to usage
 +                      
 +              default:
 +              case CC_REQUEST_USAGE:
 +                      sprint(client, "\nUsage:^3 cmd maplist\n");
 +                      sprint(client, "  No arguments required.\n");
 +                      return;
 +      }
 +}
 +
 +void ClientCommand_rankings(float request, entity client)
 +{
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(client, "  ^2rankings^7: Print information about rankings\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      sprint(client, rankings_reply);
 +                      return; // never fall through to usage
 +                      
 +              default:
 +              case CC_REQUEST_USAGE:
 +                      sprint(client, "\nUsage:^3 cmd rankings\n");
 +                      sprint(client, "  No arguments required.\n");
 +                      return;
 +      }
 +}
 +
 +void ClientCommand_ready(float request, entity client) // TODO: reimplement how this works
 +{
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(client, "  ^2ready^7: Qualify as ready to end warmup stage (or restart server if allowed)\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      if(client.flags & FL_CLIENT)
 +                      {
 +                              if(inWarmupStage || autocvar_sv_ready_restart || g_race_qualifying == 2)
 +                              {
 +                                      if(!readyrestart_happened || autocvar_sv_ready_restart_repeatable)
 +                                      {
 +                                              if (client.ready) // toggle
 +                                              {
 +                                                      client.ready = FALSE;
 +                                                      bprint(client.netname, "^2 is ^1NOT^2 ready\n");
 +                                              }
 +                                              else
 +                                              {
 +                                                      client.ready = TRUE;
 +                                                      bprint(client.netname, "^2 is ready\n");
 +                                              }
 +
 +                                              // cannot reset the game while a timeout is active!
 +                                              if(!timeoutStatus)
 +                                                      ReadyCount();
 +                                      } else {
 +                                              sprint(client, "^1Game has already been restarted\n");
 +                                      }
 +                              }
 +                      }
 +                      return; // never fall through to usage
 +                      
 +              default:
 +              case CC_REQUEST_USAGE:
 +                      sprint(client, "\nUsage:^3 cmd ready\n");
 +                      sprint(client, "  No arguments required.\n");
 +                      return;
 +      }
 +}
 +
 +void ClientCommand_records(float request, entity client)
 +{
 +      float i;
 +      
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(client, "  ^2records^7: List top 10 records for the current map\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      for(i = 0; i < 10; ++i)
 +                              sprint(client, records_reply[i]);
 +                      return; // never fall through to usage
 +                      
 +              default:
 +              case CC_REQUEST_USAGE:
 +                      sprint(client, "\nUsage:^3 cmd records\n");
 +                      sprint(client, "  No arguments required.\n");
 +                      return;
 +      }
 +}
 +
 +void ClientCommand_reportcvar(float request, entity client, string command)
 +{
 +      float tokens;
 +      string s;
 +      
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(client, "  ^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;
 +                      
 +              default:
 +              case CC_REQUEST_USAGE:
 +                      sprint(client, "\nUsage:^3 cmd reportcvar\n");
 +                      sprint(client, "  No arguments required.\n");
 +                      return;
 +      }
 +}
 +/*
 +void ClientCommand_(float request, entity client)
 +{
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(client, "  ^2blah^7: foobar\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      
 +                      return;
 +                      
 +              default:
 +              case CC_REQUEST_USAGE:
 +                      sprint(client, "\nUsage:^3 cmd \n");
 +                      sprint(client, "  No arguments required.\n");
 +                      return;
 +      }
 +}
 +
 +void ClientCommand_(float request, entity client)
 +{
 +      switch(request)
 +      {
 +              case CC_REQUEST_HELP:
 +                      sprint(client, "  ^2blah^7: foobar\n");
 +                      return;
 +                      
 +              case CC_REQUEST_COMMAND:
 +                      
 +                      return;
 +                      
 +              default:
 +              case CC_REQUEST_USAGE:
 +                      sprint(client, "\nUsage:^3 cmd \n");
 +                      sprint(client, "  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, self, 0);
 +                      ClientCommand_checkfail(CC_REQUEST_HELP, self, "");
 +                      ClientCommand_clientversion(CC_REQUEST_HELP, self, 0);
 +                      ClientCommand_cvar_changes(CC_REQUEST_HELP, self);
 +                      ClientCommand_cvar_purechanges(CC_REQUEST_HELP, self);
 +                      ClientCommand_info(CC_REQUEST_HELP, self, 0);
 +                      ClientCommand_join(CC_REQUEST_HELP, self); 
 +                      ClientCommand_ladder(CC_REQUEST_HELP, self);
 +                      ClientCommand_lsmaps(CC_REQUEST_HELP, self);
 +                      ClientCommand_lsnewmaps(CC_REQUEST_HELP, self);
 +                      ClientCommand_maplist(CC_REQUEST_HELP, self);
 +                      ClientCommand_rankings(CC_REQUEST_HELP, self);
 +                      ClientCommand_ready(CC_REQUEST_HELP, self);
 +                      ClientCommand_records(CC_REQUEST_HELP, self);
 +                      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, self, argc); break;
 +              case "checkfail": ClientCommand_checkfail(search_request_type, self, command); break;
 +              case "clientversion": ClientCommand_clientversion(search_request_type, self, argc); break;
 +              case "cvar_changes": ClientCommand_cvar_changes(search_request_type, self); break;
 +              case "cvar_purechanges": ClientCommand_cvar_purechanges(search_request_type, self); break;
 +              case "info": ClientCommand_info(search_request_type, self, argc); break;
 +              case "join": ClientCommand_join(search_request_type, self); break;
 +              case "ladder": ClientCommand_ladder(search_request_type, self); break;
 +              case "lsmaps": ClientCommand_lsmaps(search_request_type, self); break;
 +              case "lsnewmaps": ClientCommand_lsnewmaps(search_request_type, self); break;
 +              case "maplist": ClientCommand_maplist(search_request_type, self); break;
 +              case "rankings": ClientCommand_rankings(search_request_type, self); break;
 +              case "ready": ClientCommand_ready(search_request_type, self); break;
 +              case "records": ClientCommand_records(search_request_type, self); break;
 +              
 +              default:
 +                      clientcommand(self, command); //print("Invalid command. For a list of supported commands, try cmd help.\n");
 +      }
++}