From: Samual <samual@xonotic.org>
Date: Tue, 13 Dec 2011 07:42:50 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/updatecommands
X-Git-Tag: xonotic-v0.6.0~188^2~28^2~160
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b0f359e16b0690d457fdc6fb7cb4f2d8d51da7bc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/updatecommands

Conflicts:
	qcsrc/server/clientcommands.qc
---

b0f359e16b0690d457fdc6fb7cb4f2d8d51da7bc
diff --cc qcsrc/server/clientcommands.qc
index d85ff2d5f,7f52f8f8c..86ff171f0
--- a/qcsrc/server/clientcommands.qc
+++ b/qcsrc/server/clientcommands.qc
@@@ -1,663 -1,462 +1,665 @@@
 -entity nagger;
 -float readycount;
 +// =========================================================
 +//  Server side networked commands code, reworked by Samual
 +//  Last updated: December 11th, 2011
 +// =========================================================
  
 -float Nagger_SendEntity(entity to, float sendflags)
 -{
 -	float nags, i, f, b;
 -	entity e;
 -	WriteByte(MSG_ENTITY, ENT_CLIENT_NAGGER);
 +#define CC_REQUEST_COMMAND 1
 +#define CC_REQUEST_USAGE 2
 +
 +.float cmd_floodtime;
 +.float cmd_floodcount;
 +.float checkfail;
 +.float lms_spectate_warning;
  
 -	// 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
 +string MapVote_Suggest(string m);
 +//void MapVote_SendPicture(float id)
 +
 +// move any necessary sprint statements to "print_to"
 +
 +// ============================
 +//  Misc. Supporting Functions
 +// ============================
  
 -	nags = 0;
 -	if(readycount)
 +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)
  	{
 -		nags |= 1;
 -		if(to.ready == 0)
 -			nags |= 2;
 +		if(time <= (self.cmd_floodtime + autocvar_sv_clientcommand_antispam_time))
 +		{
 +			self.cmd_floodcount += 1;
 +			if(self.cmd_floodcount > autocvar_sv_clientcommand_antispam_count) { return FALSE; } // too much spam, halt
 +		}
 +		else
 +		{
 +			self.cmd_floodtime = time;
 +			self.cmd_floodcount = 1;
 +		}
  	}
 -	if(votecalled)
 +	return TRUE; // continue, as we're not flooding yet
 +}
 +
 +
 +// =======================
 +//  Command Sub-Functions
 +// =======================
 +
 +void ClientCommand_autoswitch(float request, float argc)
 +{
 +	switch(request)
  	{
 -		nags |= 4;
 -		if(to.vote_vote == 0)
 -			nags |= 8;
 +		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;
 +		}
  	}
 -	if(inWarmupStage)
 -		nags |= 16;
 +}
  
 -	if(sendflags & 64)
 -		nags |= 64;
 +void ClientCommand_checkfail(float request, string command) // used only by client side code
 +{
 +	switch(request)
 +	{
 +		case CC_REQUEST_COMMAND:
 +		{
 +			print(sprintf("CHECKFAIL: %s (%s) epically failed check %s\n", self.netname, self.netaddress, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1))));
 +			self.checkfail = 1;
 +			return; // never fall through to usage
 +		}
 +			
 +		default:
 +		case CC_REQUEST_USAGE:
 +		{
 +			sprint(self, "\nUsage:^3 cmd checkfail message\n");
 +			sprint(self, "  Where 'message' is the message reported by client about the fail.\n");
 +			return;
 +		}
 +	}
 +}
  
 -	if(sendflags & 128)
 -		nags |= 128;
 +void ClientCommand_clientversion(float request, float argc) // used only by client side code
 +{
 +	switch(request)
 +	{
 +		case CC_REQUEST_COMMAND:
 +		{
 +			if(self.flags & FL_CLIENT)
 +			{
 +				self.version = ((argv(1) == "$gameversion") ? 1 : stof(argv(1)));
 +				
 +				if(self.version < autocvar_gameversion_min || self.version > autocvar_gameversion_max)
 +				{
 +					self.version_mismatch = 1;
 +					ClientKill_TeamChange(-2); // observe
 +				} 
 +				else if(autocvar_g_campaign || autocvar_g_balance_teams || autocvar_g_balance_teams_force) 
 +				{
 +					//JoinBestTeam(self, FALSE, TRUE);
 +				} 
 +				else if(teamplay && !autocvar_sv_spectate && !(self.team_forced > 0)) 
 +				{
 +					self.classname = "observer"; // really?
 +					stuffcmd(self, "menu_showteamselect\n");
 +				}
 +			}
 +			return; // never fall through to usage
 +		}
 +			
 +		default:
 +		case CC_REQUEST_USAGE:
 +		{
 +			sprint(self, "\nUsage:^3 cmd clientversion version\n");
 +			sprint(self, "  Where 'version' is the game version reported by self.\n");
 +			return;
 +		}
 +	}
 +}
  
 -	if(!(nags & 4)) // no vote called? send no string
 -		nags &~= (64 | 128);
 +void ClientCommand_cvar_changes(float request)
 +{
 +	switch(request)
 +	{
 +		case CC_REQUEST_COMMAND:
 +		{
 +			sprint(self, cvar_changes);
 +			return; // never fall through to usage
 +		}
 +			
 +		default:
 +		case CC_REQUEST_USAGE:
 +		{
 +			sprint(self, "\nUsage:^3 sv_cmd cvar_changes\n");
 +			sprint(self, "  No arguments required.\n");
 +			//sprint(self, "See also: ^2cvar_purechanges^7\n");
 +			return;
 +		}
 +	}
 +}
  
 -	WriteByte(MSG_ENTITY, nags);
 +void ClientCommand_cvar_purechanges(float request)
 +{
 +	switch(request)
 +	{
 +		case CC_REQUEST_COMMAND:
 +		{
 +			sprint(self, cvar_purechanges);
 +			return; // never fall through to usage
 +		}
 +			
 +		default:
 +		case CC_REQUEST_USAGE:
 +		{
 +			sprint(self, "\nUsage:^3 sv_cmd cvar_purechanges\n");
 +			sprint(self, "  No arguments required.\n");
 +			//sprint(self, "See also: ^2cvar_changes^7\n");
 +			return;
 +		}
 +	}
 +}
  
 -	if(nags & 64)
 +void ClientCommand_getmapvotepic(float request, float argc)
 +{
 +	switch(request)
  	{
 -		WriteByte(MSG_ENTITY, vote_yescount);
 -		WriteByte(MSG_ENTITY, vote_nocount);
 -		WriteByte(MSG_ENTITY, vote_needed_absolute);
 -		WriteChar(MSG_ENTITY, to.vote_vote);
 +		case CC_REQUEST_COMMAND:
 +		{
 +			if(intermission_running)				
 +				MapVote_SendPicture(stof(argv(1)));
 +
 +			return; // never fall through to usage
 +		}
 +			
 +		default:
 +		case CC_REQUEST_USAGE:
 +		{
 +			sprint(self, "\nUsage:^3 cmd getmapvotepic mapid\n");
 +			sprint(self, "  Where 'mapid' is the id number of the map to request an image of on the map vote selection menu.\n");
 +			return;
 +		}
  	}
 +}
  
 -	if(nags & 128)
 -		WriteString(MSG_ENTITY, votecalledvote_display);
 +void ClientCommand_info(float request, float argc)
 +{	
 +	switch(request)
 +	{
 +		case CC_REQUEST_COMMAND:
 +		{
 +			string command;
 +			
 +			command = builtin_cvar_string(strcat("sv_info_", argv(1))); 
 +			if(command)
 +				wordwrap_sprint(command, 1111); // why 1111?
 +			else
 +				sprint(self, "ERROR: unsupported info command\n");
 +				
 +			return; // never fall through to usage
 +		}
 +			
 +		default:
 +		case CC_REQUEST_USAGE:
 +		{
 +			sprint(self, "\nUsage:^3 cmd info request\n");
 +			sprint(self, "  Where 'request' is the suffixed string appended onto the request for cvar.\n");
 +			return;
 +		}
 +	}
 +}
  
 -	if(nags & 1)
 +void ClientCommand_join(float request)
 +{
 +	switch(request)
  	{
 -		for(i = 1; i <= maxclients; i += 8)
 +		case CC_REQUEST_COMMAND:
  		{
 -			for(f = 0, e = edict_num(i), b = 1; b < 256; b *= 2, e = nextent(e))
 -				if(clienttype(e) != CLIENTTYPE_REAL || e.ready)
 -					f |= b;
 -			WriteByte(MSG_ENTITY, f);
 +			if(self.flags & FL_CLIENT)
 +			{
 +				if(self.classname != "player" && !lockteams && !g_arena)
 +				{
 +					if(nJoinAllowed(1)) 
 +					{
 +						if(g_ca) { self.caplayer = 1; }
 +						if(autocvar_g_campaign) { campaign_bots_may_start = 1; }
 +						
 +						self.classname = "player";
 +						PlayerScore_Clear(self);
 +						bprint ("^4", self.netname, "^4 is playing now\n");
 +						PutClientInServer();
 +					}
 +					else 
 +					{
 +						//player may not join because of g_maxplayers is set
 +						centerprint(self, PREVENT_JOIN_TEXT);
 +					}
 +				}
 +			}
 +			return; // never fall through to usage
 +		}
 +			
 +		default:
 +		case CC_REQUEST_USAGE:
 +		{
 +			sprint(self, "\nUsage:^3 cmd join\n");
 +			sprint(self, "  No arguments required.\n");
 +			return;
  		}
  	}
 +}
  
 -	return TRUE;
 +void ClientCommand_ladder(float request)
 +{
 +	switch(request)
 +	{
 +		case CC_REQUEST_COMMAND:
 +		{
 +			sprint(self, ladder_reply);
 +			return; // never fall through to usage
 +		}
 +			
 +		default:
 +		case CC_REQUEST_USAGE:
 +		{
 +			sprint(self, "\nUsage:^3 cmd ladder\n");
 +			sprint(self, "  No arguments required.\n");
 +			return;
 +		}
 +	}
  }
 -void Nagger_Init()
 +
 +void ClientCommand_lsmaps(float request)
  {
 -	Net_LinkEntity(nagger = spawn(), FALSE, 0, Nagger_SendEntity);
 +	switch(request)
 +	{
 +		case CC_REQUEST_COMMAND:
 +		{
 +			sprint(self, lsmaps_reply);
 +			return; // never fall through to usage
 +		}
 +			
 +		default:
 +		case CC_REQUEST_USAGE:
 +		{
 +			sprint(self, "\nUsage:^3 cmd lsmaps\n");
 +			sprint(self, "  No arguments required.\n");
 +			return;
 +		}
 +	}
  }
 -void Nagger_VoteChanged()
 +
 +void ClientCommand_lsnewmaps(float request)
  {
 -	if(nagger)
 -		nagger.SendFlags |= 128;
 +	switch(request)
 +	{
 +		case CC_REQUEST_COMMAND:
 +		{
 +			sprint(self, lsnewmaps_reply);
 +			return; // never fall through to usage
 +		}
 +			
 +		default:
 +		case CC_REQUEST_USAGE:
 +		{
 +			sprint(self, "\nUsage:^3 cmd lsnewmaps\n");
 +			sprint(self, "  No arguments required.\n");
 +			return;
 +		}
 +	}
  }
 -void Nagger_VoteCountChanged()
 +
 +void ClientCommand_maplist(float request)
  {
 -	if(nagger)
 -		nagger.SendFlags |= 64;
 +	switch(request)
 +	{
 +		case CC_REQUEST_COMMAND:
 +		{
 +			sprint(self, maplist_reply);
 +			return; // never fall through to usage
 +		}
 +			
 +		default:
 +		case CC_REQUEST_USAGE:
 +		{
 +			sprint(self, "\nUsage:^3 cmd maplist\n");
 +			sprint(self, "  No arguments required.\n");
 +			return;
 +		}
 +	}
  }
 -void Nagger_ReadyCounted()
 +
 +void ClientCommand_rankings(float request)
  {
 -	if(nagger)
 -		nagger.SendFlags |= 1;
 +	switch(request)
 +	{
 +		case CC_REQUEST_COMMAND:
 +		{
 +			sprint(self, rankings_reply);
 +			return; // never fall through to usage
 +		}
 +			
 +		default:
 +		case CC_REQUEST_USAGE:
 +		{
 +			sprint(self, "\nUsage:^3 cmd rankings\n");
 +			sprint(self, "  No arguments required.\n");
 +			return;
 +		}
 +	}
  }
  
 -void ReadyCount();
 -string MapVote_Suggest(string m);
 +void ClientCommand_ready(float request) 
 +{
 +	switch(request)
 +	{
 +		case CC_REQUEST_COMMAND:
 +		{
 +			if(self.flags & FL_CLIENT)
 +			{
 +				if(inWarmupStage || autocvar_sv_ready_restart || g_race_qualifying == 2)
 +				{
 +					if(!readyrestart_happened || autocvar_sv_ready_restart_repeatable)
 +					{
 +						if (self.ready) // toggle
 +						{
 +							self.ready = FALSE;
 +							bprint(self.netname, "^2 is ^1NOT^2 ready\n");
 +						}
 +						else
 +						{
 +							self.ready = TRUE;
 +							bprint(self.netname, "^2 is ready\n");
 +						}
  
 -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;
 +						// 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;
  		}
  	}
 -	return world;
  }
  
 -//float ctf_clientcommand();
 -float readyrestart_happened;
 -.float lms_spectate_warning;
 -void spawnfunc_func_breakable();
 +void ClientCommand_records(float request) // TODO: Isn't this flooding with the sprint messages? Old code, but perhaps bad?
 +{	
 +	switch(request)
 +	{
 +		case CC_REQUEST_COMMAND:
 +		{
 +			float i;
 +			
 +			for(i = 0; i < 10; ++i)
 +				sprint(self, records_reply[i]);
 +				
 +			return; // never fall through to usage
 +		}
 +			
 +		default:
 +		case CC_REQUEST_USAGE:
 +		{
 +			sprint(self, "\nUsage:^3 cmd records\n");
 +			sprint(self, "  No arguments required.\n");
 +			return;
 +		}
 +	}
 +}
  
 -.float cmd_floodtime;
 -.float cmd_floodcount;
 -float cmd_floodcheck()
 -{
 -	if (timeoutStatus != 2)
 +void ClientCommand_reportcvar(float request, float argc, string command) // TODO: confirm this works
 +{	
 +	switch(request)
  	{
 -		if(time == self.cmd_floodtime)
 +		case CC_REQUEST_COMMAND:
  		{
 -			self.cmd_floodcount += 1;
 -			if(self.cmd_floodcount > 8)
 -				return TRUE;
 +			float tokens;
 +			string s;
 +			
 +			if(substring(argv(2), 0, 1) == "$") // undefined cvar: use the default value on the server then
 +			{
 +				s = strcat(substring(command, argv_start_index(0), argv_end_index(1) - argv_start_index(0)), " \"", cvar_defstring(argv(1)), "\"");
 +				tokens = tokenize_console(s);
 +			}
 +			GetCvars(1);
 +			return; // never fall through to usage
  		}
 -		else
 +			
 +		default:
 +		case CC_REQUEST_USAGE:
  		{
 -			self.cmd_floodtime = time;
 -			self.cmd_floodcount = 1;
 +			sprint(self, "\nUsage:^3 cmd reportcvar <cvar>\n");
 +			sprint(self, "  Where 'cvar' is the cvar plus arguments to send to the server.\n");
 +			return;
  		}
  	}
 -	return FALSE;
  }
  
 -.float checkfail;
 -void SV_ParseClientCommand(string s) {
 -	float i;
 -	entity e;
 +void ClientCommand_say(float request, float argc, string command)
 +{
 +	switch(request)
 +	{
 +		case CC_REQUEST_COMMAND:
 +		{
 +			if(argc >= 2) { Say(self, FALSE, world, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)), 1); }
 +			return; // never fall through to usage
 +		}
 +			
 +		default:
 +		case CC_REQUEST_USAGE:
 +		{
 +			sprint(self, "\nUsage:^3 cmd say <message>\n");
 +			sprint(self, "  Where 'message' is the string of text to say.\n");
 +			return;
 +		}
 +	}
 +}
  
 -	cmd_argc = tokenize_console(s);
 -	cmd_string = s;
 -	cmd_name = strtolower(argv(0));
 -	if(cmd_name != "reportcvar")
 -	if(cmd_name != "sentcvar")
 -	if(cmd_name != "pause")
 -	if(cmd_name != "prespawn")
 -	if(cmd_name != "spawn")
 -	if(cmd_name != "begin")
 +void ClientCommand_say_team(float request, float argc, string command)
 +{
 +	switch(request)
  	{
 -		if(cmd_floodcheck())
 +		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;
 +		}
  	}
 +}
  
 -	if(MUTATOR_CALLHOOK(SV_ParseClientCommand))
 -		return; // already handled
 -	
 -	if(GameCommand_Vote(s, self)) {
 -		return;
 -	} else if(GameCommand_MapVote(argv(0))) {
 -		return;
 -	} else if(cmd_name == "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_name == "autoswitch") {
 -		// be backwards compatible with older clients (enabled)
 -		self.autoswitch = ("0" != argv(1));
 -		string autoswitchmsg;
 -		if (self.autoswitch) {
 -			autoswitchmsg = "on";
 -		} else {
 -			autoswitchmsg = "off";
 -		}
 -		sprint(self, strcat("^1autoswitch turned ", autoswitchmsg, "\n"));
 -	} else if(cmd_name == "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_name == "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)), "\"");
 -			cmd_argc = tokenize_console(s);
 -		}
 -		GetCvars(1);
 -	} else if(cmd_name == "sentcvar") { // new system
 -		if(cmd_argc == 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)), "\"");
 -			cmd_argc = tokenize_console(s);
 -		}
 -		GetCvars(1);
 -	} else if(cmd_name == "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
 +void ClientCommand_selectteam(float request, float argc) // TODO: Update the messages for this command
 +{
 +	switch(request)
 +	{
 +		case CC_REQUEST_COMMAND:
 +		{
 +			float selection;
 +			
 +			if (self.flags & FL_CLIENT)
  			{
 -				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(teamplay)
 +					if not(self.team_forced > 0) 
 +						if not(lockteams) 
 +						{
 +							switch(argv(1))
 +							{
 +								case "red": selection = COLOR_TEAM1; break;
 +								case "blue": selection = COLOR_TEAM2; break;
 +								case "yellow": selection = COLOR_TEAM3; break;
 +								case "pink": selection = COLOR_TEAM4; break;
 +								case "auto": selection = (-1); break;
 +								
 +								default: break;
 +							}
 +							
 +							if(selection)
 +							{
- 								if(self.team != selection || self.deadflag != DEAD_NO)
- 									ClientKill_TeamChange(selection);
- 								else
++								if(self.team == selection && self.deadflag == DEAD_NO)
 +									sprint(self, "^7You already are on that team.\n");
++								else if(self.wasplayer && autocvar_g_changeteam_banned)
++									sprint(self, "^1You cannot change team, forbidden by the server.\n");
++								else
++									ClientKill_TeamChange(selection);
 +							}
 +						}
 +						else
 +							sprint(self, "^7The game has already begun, you must wait until the next map to be able to join a team.\n");
 +					else
 +						sprint(self, "^7selectteam can not be used as your team is forced\n");
 +				else
 +					sprint(self, "^7selectteam can only be used in teamgames\n");
  			}
 +			return; // never fall through to usage
  		}
 -		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_name == "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(self, PREVENT_JOIN_TEXT);
 -			}
 +
 +		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;
  		}
 -	} else if( cmd_name == "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" ) {
 -			if(self.team == COLOR_TEAM1 && self.deadflag == DEAD_NO)
 -				sprint( self, "^7You already are on that team.\n");
 -			else if (self.wasplayer && autocvar_g_changeteam_banned)
 -				sprint( self, "^1You cannot change team, forbidden by the server.\n");
 -			else
 -				ClientKill_TeamChange(COLOR_TEAM1);
 -		} else if( argv(1) == "blue" ) {
 -			if(self.team == COLOR_TEAM2 && self.deadflag == DEAD_NO)
 -				sprint( self, "^7You already are on that team.\n");
 -			else if (self.wasplayer && autocvar_g_changeteam_banned)
 -				sprint( self, "^1You cannot change team, forbidden by the server.\n");
 -			else
 -				ClientKill_TeamChange(COLOR_TEAM2);
 -		} else if( argv(1) == "yellow" ) {
 -			if(self.team == COLOR_TEAM3 && self.deadflag == DEAD_NO)
 -				sprint( self, "^7You already are on that team.\n");
 -			else if (self.wasplayer && autocvar_g_changeteam_banned)
 -				sprint( self, "^1You cannot change team, forbidden by the server.\n");
 -			else
 -				ClientKill_TeamChange(COLOR_TEAM3);
 -		} else if( argv(1) == "pink" ) {
 -			if(self.team == COLOR_TEAM4 && self.deadflag == DEAD_NO)
 -				sprint( self, "^7You already are on that team.\n");
 -			else if (self.wasplayer && autocvar_g_changeteam_banned)
 -				sprint( self, "^1You cannot change team, forbidden by the server.\n");
 -			else
 -				ClientKill_TeamChange(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" ) );
 +	}
 +}
 +
 +void ClientCommand_selfstuff(float request, string command)
 +{
 +	switch(request)
 +	{
 +		case CC_REQUEST_COMMAND:
 +		{
 +			stuffcmd(self, substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)));
 +			return; // never fall through to usage
  		}
 -	} else if(cmd_name == "ready") {
 -		if not(self.flags & FL_CLIENT)
 +			
 +		default:
 +		case CC_REQUEST_USAGE:
 +		{
 +			sprint(self, "\nUsage:^3 cmd selfstuff command\n");
 +			sprint(self, "  Where 'command' is the string to be stuffed to your client.\n");
  			return;
 +		}
 +	}
 +}
  
 -		if((inWarmupStage)
 -		   || autocvar_sv_ready_restart || g_race_qualifying == 2)
 +void ClientCommand_sentcvar(float request, float argc, string command)
 +{
 +	switch(request)
 +	{
 +		case CC_REQUEST_COMMAND:
  		{
 -			if(!readyrestart_happened || autocvar_sv_ready_restart_repeatable)
 +			float tokens;
 +			string s;
 +			
 +			if(argc == 2) // undefined cvar: use the default value on the server then
  			{
 -				if (self.ready) // toggle
 +				s = strcat(substring(command, argv_start_index(0), argv_end_index(1) - argv_start_index(0)), " \"", cvar_defstring(argv(1)), "\"");
 +				tokens = tokenize_console(s);
 +			}
 +			GetCvars(1);
 +			return; // never fall through to usage
 +		}
 +			
 +		default:
 +		case CC_REQUEST_USAGE:
 +		{
 +			sprint(self, "\nUsage:^3 cmd sentcvar <cvar>\n");
 +			sprint(self, "  Where 'cvar' is the cvar plus arguments to send to the server.\n");
 +			return;
 +		}
 +	}
 +}
 +
 +void ClientCommand_spectate(float request)
 +{
 +	switch(request)
 +	{
 +		case CC_REQUEST_COMMAND:
 +		{
 +			if(self.flags & FL_CLIENT)
 +			{
 +				if(g_arena) { return; } 
 +				if(g_lms)
  				{
 -					self.ready = FALSE;
 -					bprint(self.netname, "^2 is ^1NOT^2 ready\n");
 +					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;
 +					}
  				}
 -				else
 +				
 +				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"))
  				{
 -					self.ready = TRUE;
 -					bprint(self.netname, "^2 is ready\n");
 +					sprint(self, "WARNING: you will spectate in the next round.\n");
 +					self.caplayer = 0;
  				}
 -
 -				// 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
  		}
 -	} else if(cmd_name == "maplist") {
 -		sprint(self, maplist_reply);
 -	} else if(cmd_name == "lsmaps") {
 -		sprint(self, lsmaps_reply);
 -	} else if(cmd_name == "lsnewmaps") {
 -		sprint(self, lsnewmaps_reply);
 -	} else if(cmd_name == "records") {
 -		for(i = 0; i < 10; ++i)
 -			sprint(self, records_reply[i]);
 -	} else if(cmd_name == "ladder") {
 -		sprint(self, ladder_reply);
 -	} else if(cmd_name == "rankings") {
 -		sprint(self, rankings_reply);
 -	} else if(cmd_name == "voice") {
 -		if(cmd_argc >= 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_name == "say") {
 -		if(cmd_argc >= 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_name == "say_team") {
 -		if(cmd_argc >= 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_name == "selfstuff") {
 -		// this command mainly serves to embed a command to be executed into a demo (HINT: use settemp)
 -		stuffcmd(self, substring(s, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)));
 -	} else if(cmd_name == "tell") {
 -		e = GetCommandPlayerSlotTargetFromTokenizedCommand(cmd_argc, 1);
 -		if(e && cmd_argc > ParseCommandPlayerSlotTarget_firsttoken)
 -		{
 -			Say(self, FALSE, e, substring(s, argv_start_index(ParseCommandPlayerSlotTarget_firsttoken), argv_end_index(-1) - argv_start_index(ParseCommandPlayerSlotTarget_firsttoken)), TRUE);
 -		}
 -		else
 +			
 +		default:
 +		case CC_REQUEST_USAGE:
  		{
 -			if(cmd_argc > 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");
 +			sprint(self, "\nUsage:^3 cmd spectate\n");
 +			sprint(self, "  No arguments required.\n");
 +			return;
  		}
 -		//clientcommand(self, formatmessage(s));
 -	} else if(cmd_name == "info") {
 -		cmd_name = builtin_cvar_string(strcat("sv_info_", argv(1))); // This needed fixed for the cvar check
 -		if(cmd_name == "")
 -			sprint(self, "ERROR: unsupported info command\n");
 -		else
 -			wordwrap_sprint(cmd_name, 1111);
 -	} else if(cmd_name == "suggestmap") {
 -		sprint(self, strcat(MapVote_Suggest(argv(1)), "\n"));
 -	} else if(cmd_name == "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_name == "timein") {
 -		if not(self.flags & FL_CLIENT)
 -			return;
 -		if(autocvar_sv_timeout) {
 -			evaluateTimein();
 -		}
 -	} else if(cmd_name == "teamstatus") {
 -		Score_NicePrint(self);
 -	} else if(cmd_name == "cvar_changes") {
 -		sprint(self, cvar_changes);
 -	} else if(cmd_name == "cvar_purechanges") {
 -		sprint(self, cvar_purechanges);
 -	} else if(CheatCommand(cmd_argc)) {
 -	} else {
 -#if 0
 -		//if(ctf_clientcommand())
 -		//	return;
 -		// grep for Cmd_AddCommand_WithClientCommand to find them all
 -		if(cmd_name != "status")
 -		//if(cmd_name != "say") // handled above
 -		//if(cmd_name != "say_team") // handled above
 -		if(cmd_name != "kill")
 -		if(cmd_name != "pause")
 -		if(cmd_name != "ping")
 -		if(cmd_name != "name")
 -		if(cmd_name != "color")
 -		if(cmd_name != "rate")
 -		if(cmd_name != "pmodel")
 -		if(cmd_name != "playermodel")
 -		if(cmd_name != "playerskin")
 -		if(cmd_name != "prespawn")
 -		if(cmd_name != "spawn")
 -		if(cmd_name != "begin")
 -		if(cmd_name != "pings")
 -		if(cmd_name != "sv_startdownload")
 -		if(cmd_name != "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 == "name" || cmd_name == "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;
 +void ClientCommand_suggestmap(float request, float argc)
 +{
 +	switch(request)
 +	{
 +		case CC_REQUEST_COMMAND:
 +		{
 +			sprint(self, strcat(MapVote_Suggest(argv(1)), "\n"));
 +			return; // never fall through to usage
 +		}
 +			
 +		default:
 +		case CC_REQUEST_USAGE:
 +		{
 +			sprint(self, "\nUsage:^3 cmd suggestmap map\n");
 +			sprint(self, "  Where 'map' is the name of the map to suggest.\n");
 +			return;
  		}
 -
 -		clientcommand(self,s);
  	}
  }