From: Samual <samual@xonotic.org>
Date: Thu, 4 Aug 2011 17:53:53 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/updatecommands
X-Git-Tag: xonotic-v0.6.0~188^2~28^2~274
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9342fa27f9245d9dd57c524876e583475fe3c0f9;p=xonotic%2Fxonotic-data.pk3dir.git

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

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

9342fa27f9245d9dd57c524876e583475fe3c0f9
diff --cc qcsrc/server/clientcommands.qc
index 88672c7e3,bace1dd7e..8770f11f7
--- a/qcsrc/server/clientcommands.qc
+++ b/qcsrc/server/clientcommands.qc
@@@ -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");
 +	}
- }
++}