X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fcommand%2Fgeneric.qc;h=b7b8da0e9f407f64da0bab06bc3dae90c7d4c528;hp=9595ed5c298187c799ca628d402a94bd4c7882de;hb=dbcdd58814a7281aef637c8c07a02242331c4c86;hpb=bcb30bf31a58942eb89829a72b1e76661de7920c

diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc
index 9595ed5c2..b7b8da0e9 100644
--- a/qcsrc/common/command/generic.qc
+++ b/qcsrc/common/command/generic.qc
@@ -1,276 +1,546 @@
-#define MAX_RPN_STACK 16
-float rpn_db;
-float rpn_error;
-float rpn_sp;
-string rpn_stack[MAX_RPN_STACK];
-string rpn_pop() {
-	if(rpn_sp > 0) {
-		--rpn_sp;
-		return rpn_stack[rpn_sp];
-	} else {
-		print("rpn: stack underflow\n");
-		rpn_error = TRUE;
-		return "";
-	}
-}
-void rpn_push(string s) {
-	if(rpn_sp < MAX_RPN_STACK) {
-		rpn_stack[rpn_sp] = s;
-		++rpn_sp;
-	} else {
-		print("rpn: stack overflow\n");
-		rpn_error = TRUE;
-	}
-}
-string rpn_get() {
-	if(rpn_sp > 0) {
-		return rpn_stack[rpn_sp - 1];
-	} else {
-		print("rpn: empty stack\n");
-		rpn_error = TRUE;
-		return "";
-	}
-}
-void rpn_set(string s) {
-	if(rpn_sp > 0) {
-		rpn_stack[rpn_sp - 1] = s;
-	} else {
-		print("rpn: empty stack\n");
-		rpn_error = TRUE;
-	}
+// =========================================================
+//  Generic program common command code, written by Samual
+//  Last updated: February 19th, 2012
+// =========================================================
+
+// used by generic commands for better help/usage information
+string GetProgramCommandPrefix(void)
+{
+	#ifdef SVQC
+	return "sv_cmd";
+	#endif
+	#ifdef CSQC
+	return "cl_cmd";
+	#endif
+	#ifdef MENUQC
+	return "menu_cmd";
+	#endif
 }
-float rpn_getf() { return stof(rpn_get()); }
-float rpn_popf() { return stof(rpn_pop()); }
-void rpn_pushf(float f) { return rpn_push(ftos(f)); }
-void rpn_setf(float f) { return rpn_set(ftos(f)); }
-
-#define NUM_MARKUPS	41
-float markup_init;
-string markup_from[NUM_MARKUPS];
-string markup_to[NUM_MARKUPS];
-void GameCommand_MarkupInit()
+
+// used by curl command
+void Curl_URI_Get_Callback(float id, float status, string data)
 {
 	float i;
-	if (markup_init)
+	float do_exec;
+	string do_cvar;
+	i = id - URI_GET_CURL;
+	do_exec = curl_uri_get_exec[i];
+	do_cvar = curl_uri_get_cvar[i];
+	if(status != 0)
+	{
+		print(sprintf(_("error: status is %d\n"), status));
+		if(do_cvar)
+			strunzone(do_cvar);
 		return;
-	markup_init = 1;
-	i = 0;
-	markup_from[i] = "&alien"; markup_to[i] = "\x12"; ++i;
-	markup_from[i] = "&:-)"; markup_to[i] = "\x13"; ++i;
-	markup_from[i] = "&:-("; markup_to[i] = "\x14"; ++i;
-	markup_from[i] = "&x-P"; markup_to[i] = "\x15"; ++i;
-	markup_from[i] = "&:-/"; markup_to[i] = "\x16"; ++i;
-	markup_from[i] = "&:-D"; markup_to[i] = "\x17"; ++i;
-	markup_from[i] = "&<<"; markup_to[i] = "\x18"; ++i;
-	markup_from[i] = "&>>"; markup_to[i] = "\x19"; ++i;
-	markup_from[i] = "&dot"; markup_to[i] = "\x1a"; ++i;
-	markup_from[i] = "&^_"; markup_to[i] = "\x1b"; ++i;
-	markup_from[i] = "&ysplat"; markup_to[i] = "\x1c"; ++i;
-	markup_from[i] = "&-]"; markup_to[i] = "\x1d"; ++i;
-	markup_from[i] = "&--"; markup_to[i] = "\x1e"; ++i;
-	markup_from[i] = "&[-"; markup_to[i] = "\x1f"; ++i;
-	markup_from[i] = "&s<"; markup_to[i] = "\x2c"; ++i;
-	markup_from[i] = "&s>"; markup_to[i] = "\x2e"; ++i;
-	markup_from[i] = "&<-"; markup_to[i] = "\x7f"; ++i;
-	markup_from[i] = "&[="; markup_to[i] = "\x80"; ++i;
-	markup_from[i] = "&=="; markup_to[i] = "\x81"; ++i;
-	markup_from[i] = "&=]"; markup_to[i] = "\x82"; ++i;
-	markup_from[i] = "&r!"; markup_to[i] = "\x84"; ++i;
-	markup_from[i] = "&|o|"; markup_to[i] = "\x85"; ++i;
-	markup_from[i] = "&|u|"; markup_to[i] = "\x86"; ++i;
-	markup_from[i] = "&|i|"; markup_to[i] = "\x87"; ++i;
-	markup_from[i] = "&|c|"; markup_to[i] = "\x88"; ++i;
-	markup_from[i] = "&[c]"; markup_to[i] = "\x89"; ++i;
-	markup_from[i] = "&[n]"; markup_to[i] = "\x8a"; ++i;
-	markup_from[i] = "&[]"; markup_to[i] = "\x8b"; ++i;
-	markup_from[i] = "&r?"; markup_to[i] = "\x8c"; ++i;
-	markup_from[i] = "&|>"; markup_to[i] = "\x8d"; ++i;
-	markup_from[i] = "&splat0"; markup_to[i] = "\x8e"; ++i;
-	markup_from[i] = "&splat1"; markup_to[i] = "\x8f"; ++i;
-	markup_from[i] = "&[["; markup_to[i] = "\x90"; ++i;
-	markup_from[i] = "&]]"; markup_to[i] = "\x91"; ++i;
-	markup_from[i] = "&splat2"; markup_to[i] = "\x9a"; ++i;
-	markup_from[i] = "&)("; markup_to[i] = "\x9b"; ++i;
-	markup_from[i] = "&splat3"; markup_to[i] = "\x9c"; ++i;
-	markup_from[i] = "&(."; markup_to[i] = "\x9d"; ++i;
-	markup_from[i] = "&.."; markup_to[i] = "\x9e"; ++i;
-	markup_from[i] = "&.)"; markup_to[i] = "\x9f"; ++i;
-	markup_from[i] = "&<|"; markup_to[i] = "\xff"; ++i;
+	}
+	if(do_exec)
+		localcmd(data);
+	if(do_cvar)
+	{
+		cvar_set(do_cvar, data);
+		strunzone(do_cvar);
+	}
+	if(!do_exec && !do_cvar)
+		print(data);
 }
 
-string GameCommand_Markup(string s2)
-{
-	float red, ccase, i, j;
-	string s, s3;
-
-	GameCommand_MarkupInit();
 
-	s = "";
+// =======================
+//  Command Sub-Functions
+// =======================
 
-	red = 0;
-	ccase = 0;
-	for(i = 0; i < strlen(s2); ++i)
+void GenericCommand_addtolist(float request, float argc)
+{
+	switch(request)
 	{
-		for(j = 0; j < NUM_MARKUPS; ++j)
+		case CMD_REQUEST_COMMAND:
 		{
-			s3 = substring(s2, i, strlen(markup_from[j]));
-			if (s3 == markup_from[j])
+			float i;
+			
+			if(argc >= 2)
 			{
-				s = strcat(s, markup_to[j]);
-				i += strlen(markup_from[j]) - 1;
-				break;
+				string original_cvar = argv(1);
+				string tmp_string = argv(2);
+				
+				if(cvar_string(original_cvar) == "") // cvar was empty
+				{
+					cvar_set(original_cvar, tmp_string);
+				}
+				else // add it to the end of the list if the list doesn't already have it
+				{
+					argc = tokenizebyseparator(cvar_string(original_cvar), " ");
+					
+					for(i = 0; i < argc; ++i)
+						if(argv(i) == tmp_string)
+							return; // already in list
+							
+					cvar_set(original_cvar, strcat(tmp_string, " ", cvar_string(original_cvar)));
+				}
+				return;
 			}
 		}
+			
+		default:
+			print("Incorrect parameters for ^2addtolist^7\n");
+		case CMD_REQUEST_USAGE:
+		{
+			print(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " addtolist variable value"));
+			print("  Where 'variable' is what to add 'value' to.\n");
+			print("See also: ^2removefromlist^7\n");
+			return;
+		}
+	}
+}
 
-		if(j == NUM_MARKUPS)
+void GenericCommand_curl(float request, float argc)
+{
+	switch(request)
+	{
+		case CMD_REQUEST_COMMAND:
 		{
-			if(substring(s2, i, 2) == "&&")
+			float do_exec;
+			string do_cvar;
+			float key;
+			float i, j;
+			string url;
+			float buf;
+			float r;
+
+			do_exec = FALSE;
+			do_cvar = string_null;
+			key = -1;
+
+			for(i = 1; i+1 < argc; ++i)
 			{
-				s = strcat(s, strconv(ccase, red, red, "&"));
-				++i;
+				if(argv(i) == "--cvar" && i+2 < argc)
+				{
+					++i;
+					do_cvar = strzone(argv(i));
+					continue;
+				}
+				if(argv(i) == "--exec")
+				{
+					do_exec = TRUE;
+					continue;
+				}
+				if(argv(i) == "--key" && i+2 < argc)
+				{
+					++i;
+					key = stof(argv(i));
+					continue;
+				}
+				break;
 			}
-			else if(substring(s2, i, 2) == "&d")
+
+			// now, argv(i) is the URL
+			// following args may be POST parameters
+			url = argv(i);
+			++i;
+			buf = buf_create();
+			j = 0;
+			for(; i+1 < argc; i += 2)
+				bufstr_set(buf, ++j, sprintf("%s=%s", uri_escape(argv(i)), uri_escape(argv(i+1))));
+			if(i < argc)
+				bufstr_set(buf, ++j, sprintf("submit=%s", uri_escape(argv(i))));
+
+			if(j == 0) // no args: GET
+				r = crypto_uri_postbuf(url, URI_GET_CURL + curl_uri_get_pos, string_null, string_null, -1, key);
+			else // with args: POST
+				r = crypto_uri_postbuf(url, URI_GET_CURL + curl_uri_get_pos, "application/x-www-form-urlencoded", "&", buf, key);
+
+			if(r)
 			{
-				red = 2;
-				ccase = 0;
-				++i;
+				curl_uri_get_exec[curl_uri_get_pos] = do_exec;
+				curl_uri_get_cvar[curl_uri_get_pos] = do_cvar;
+				curl_uri_get_pos = mod(curl_uri_get_pos + 1, URI_GET_CURL_END - URI_GET_CURL + 1);
 			}
-			else if(substring(s2, i, 2) == "&a")
+			else
+				print(_("error creating curl handle\n"));
+
+			buf_del(buf);
+
+			return;
+		}
+			
+		default:
+		case CMD_REQUEST_USAGE:
+		{
+			print(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " curl [--key N] [--cvar] [--exec] URL [postargs...]"));
+			return;
+		}
+	}
+}
+
+void GenericCommand_dumpcommands(float request)
+{
+	switch(request)
+	{
+		case CMD_REQUEST_COMMAND:
+		{
+			float fh;
+			string filename = strcat(GetProgramCommandPrefix(), "_dump.txt");
+			fh = fopen(filename, FILE_WRITE);
+			
+			if(fh >= 0)
 			{
-				red = 2;
-				ccase = 2;
-				++i;
+				#ifdef SVQC
+					CMD_Write("dump of server console commands:\n");
+					GameCommand_macro_write_aliases(fh);
+					
+					CMD_Write("\ndump of networked client only commands:\n");
+					ClientCommand_macro_write_aliases(fh);
+					
+					CMD_Write("\ndump of common commands:\n");
+					CommonCommand_macro_write_aliases(fh);
+
+					CMD_Write("\ndump of ban commands:\n");
+					BanCommand_macro_write_aliases(fh);
+				#endif
+								
+				#ifdef CSQC
+					CMD_Write("dump of client commands:\n");
+					LocalCommand_macro_write_aliases(fh);
+				#endif
+				
+				CMD_Write("\ndump of generic commands:\n");
+				GenericCommand_macro_write_aliases(fh);
+				
+				print("Completed dump of aliases in ^2data/data/", GetProgramCommandPrefix(), "_dump.txt^7.\n");
+				
+				fclose(fh);
 			}
-			else if(substring(s2, i, 2) == "&n")
+			else
 			{
-				red = 0;
-				ccase = 0;
-				++i;
+				print("^1Error: ^7Could not dump to file!\n");
 			}
-			else
-				s = strcat(s, strconv(ccase, red, red, substring(s2, i, 1)));
+			return;
+		}
+			
+		default:
+		case CMD_REQUEST_USAGE:
+		{
+			print(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " dumpcommands"));
+			print("  No arguments required.\n");
+			return;
 		}
 	}
+}
 
-	return s;
+void GenericCommand_maplist(float request, float argc)
+{
+	switch(request)
+	{
+		case CMD_REQUEST_COMMAND:
+		{
+			string tmp_string;
+			float i;
+			
+			switch(argv(1))
+			{
+				case "add": // appends new maps to the maplist
+				{
+					if(argc == 3)
+					{
+						if (!fexists(strcat("maps/", argv(2), ".bsp")))
+						{
+							print("maplist: ERROR: ", argv(2), " does not exist!\n");
+							break;
+						}
+						
+						if(cvar_string("g_maplist") == "")
+							cvar_set("g_maplist", argv(2));
+						else
+							cvar_set("g_maplist", strcat(argv(2), " ", cvar_string("g_maplist")));
+							
+						return;
+					}
+					break; // go to usage
+				}
+				
+				case "cleanup": // scans maplist and only adds back the ones which are really usable
+				{
+					MapInfo_Enumerate();
+					MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0);
+					argc = tokenizebyseparator(cvar_string("g_maplist"), " ");
+					
+					tmp_string = "";
+					for(i = 0; i < argc; ++i)
+						if(MapInfo_CheckMap(argv(i)))
+							tmp_string = strcat(tmp_string, " ", argv(i));
+							
+					tmp_string = substring(tmp_string, 1, strlen(tmp_string) - 1);
+					cvar_set("g_maplist", tmp_string);
+					
+					return;
+				}
+				
+				case "remove": // scans maplist and only adds back whatever maps were not provided in argv(2)
+				{
+					if(argc == 3)
+					{
+						argc = tokenizebyseparator(cvar_string("g_maplist"), " ");
+						
+						tmp_string = "";
+						for(i = 0; i < argc; ++i)
+							if(argv(i) != argv(2))
+								tmp_string = strcat(tmp_string, " ", argv(i));
+								
+						tmp_string = substring(tmp_string, 1, strlen(tmp_string) - 1);
+						cvar_set("g_maplist", tmp_string);
+						
+						return;
+					}
+					break; // go to usage
+				}
+				
+				case "shuffle": // randomly shuffle the maplist
+				{
+					cvar_set("g_maplist", shufflewords(cvar_string("g_maplist")));
+					return;
+				}
+					
+				default: break;
+			}
+		}
+			
+		default:
+			print("Incorrect parameters for ^2maplist^7\n");
+		case CMD_REQUEST_USAGE:
+		{
+			print(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " maplist action [map]"));
+			print("  Where 'action' is the command to complete,\n");
+			print("  and 'map' is what it acts upon (if required).\n");
+			print("  Full list of commands here: \"add, cleanup, remove, shuffle.\"\n");
+			return;
+		}
+	}
 }
 
-float GameCommand_Generic(string command)
+void GenericCommand_nextframe(float request, float arguments, string command)
 {
-	float argc;
-	float i, j, f, n;
-	vector rgb;
-	string s, s2, c;
-	argc = tokenize_console(command);
-	if(argv(0) == "help")
+	switch(request)
 	{
-		print("  rpn EXPRESSION... - a RPN calculator.\n");
-		print("    Operator description (x: string, s: set, f: float):\n");
-		print("    x pop ----------------------------->     : removes the top\n");
-		print("    x dup -----------------------------> x x : duplicates the top\n");
-		print("    x x exch --------------------------> x x : swap the top two\n");
-		print("    /cvarname load --------------------> x   : loads a cvar\n");
-		print("    /cvarname x def ------------------->     : writes to a cvar\n");
-		print("    f f add|sub|mul|div|mod|max|min ---> f   : adds/... two numbers\n");
-		print("    f f eq|ne|gt|ge|lt|le -------------> f   : compares two numbers\n");
-		print("    f neg|abs|sgn|rand|floor|ceil------> f   : negates/... a number\n");
-		print("    f f f bound -----------------------> f   : bounds the middle number\n");
-		print("    f1 f2 b when ----------------------> f   : f1 if b, f2 otherwise\n");
-		print("    s s union|intersection|difference -> s   : set operations\n");
-		print("    s shuffle -------------------------> s   : randomly arrange elements\n");
-		print("    /key /value put ------------------->     : set a database key\n");
-		print("    /key get --------------------------> s   : get a database value\n");
-		print("    x dbpush -------------------------->     : pushes the top onto the database\n");
-		print("    dbpop|dbget -----------------------> x   : removes/reads DB's top\n");
-		print("    dblen|dbat ------------------------> f   : gets the DB's size/cursor pos\n");
-		print("    dbclr ----------------------------->     : clear the DB\n");
-		print("    s dbsave|dbload-------------------->     : save/load the DB to/from a file\n");
-		print("    x dbins --------------------------->     : moves the top into the DB\n");
-		print("    dbext|dbread ----------------------> x   : extract/get from the DB's cursor\n");
-		print("    f dbmov|dbgoto -------------------->     : move or set the DB's cursor\n");
-		print("    s localtime -----------------------> s   : formats the current local time\n");
-		print("    s gmtime --------------------------> s   : formats the current UTC time\n");
-		print("    time ------------------------------> f   : seconds since VM start\n");
-		print("    s /MD4 digest ---------------------> s   : MD4 digest\n");
-		print("    s /SHA256 digest ------------------> s   : SHA256 digest\n");
-		print("    s /formatstring sprintf1s ---------> s   : sprintf with 1 string (pad, cut)\n");
-		print("    Set operations operate on 'such''strings'.\n");
-		print("    Unknown tokens insert their cvar value.\n");
-		print("  maplist add map\n");
-		print("  maplist remove map\n");
-		print("  maplist shuffle\n");
-		print("  maplist cleanup\n");
-		print("  maplist maplist\n");
-		print("  maplist lsmaps\n");
-		print("  maplist lsnewmaps\n");
-		print("  addtolist variable addedvalue\n");
-		print("  records\n");
-		print("  rankings (map argument optional)\n");
-		return TRUE;
+		case CMD_REQUEST_COMMAND:
+		{
+			queue_to_execute_next_frame(substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1)));
+			return;
+		}
+			
+		default:
+		case CMD_REQUEST_USAGE:
+		{
+			print(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " nextframe command..."));
+			print("  Where command will be executed next frame of this VM\n");
+			return;
+		}
 	}
-	
-	if(argv(0) == "maplist")
+}
+
+void GenericCommand_removefromlist(float request, float argc)
+{
+	switch(request)
 	{
-		if(argv(1) == "add" && argc == 3)
+		case CMD_REQUEST_COMMAND:
 		{
-			if (!fexists(strcat("maps/", argv(2), ".bsp")))
+			if(argc == 3)
 			{
-				print("maplist: ERROR: ", argv(2), " does not exist!\n");
-				return TRUE;
+				float i;
+				string original_cvar = argv(1);
+				string removal = argv(2);
+				string tmp_string;
+				
+				argc = tokenizebyseparator(cvar_string(original_cvar), " ");
+				
+				tmp_string = "";
+				for(i = 0; i < argc; ++i)
+					if(argv(i) != removal)
+						tmp_string = strcat(tmp_string, " ", argv(i));
+						
+				tmp_string = substring(tmp_string, 1, strlen(tmp_string) - 1);
+				cvar_set(original_cvar, tmp_string);
+				
+				return;
 			}
-			if(cvar_string("g_maplist") == "")
-				cvar_set("g_maplist", argv(2));
-			else
-				cvar_set("g_maplist", strcat(argv(2), " ", cvar_string("g_maplist")));
-			return TRUE;
 		}
-		else if(argv(1) == "remove" && argc == 3)
+			
+		default:
+			print("Incorrect parameters for ^2removefromlist^7\n");
+		case CMD_REQUEST_USAGE:
 		{
-			s = argv(2);
-			n = tokenizebyseparator(cvar_string("g_maplist"), " ");
-			s2 = "";
-			for(i = 0; i < n; ++i)
-				if(argv(i) != s)
-					s2 = strcat(s2, " ", argv(i));
-			s2 = substring(s2, 1, strlen(s2) - 1);
-			cvar_set("g_maplist", s2);
-			return TRUE;
+			print(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " removefromlist variable value"));
+			print("  Where 'variable' is what cvar to remove 'value' from.\n");
+			print("See also: ^2addtolist^7\n");
+			return;
+		}
+	}
+}
+
+void GenericCommand_settemp(float request, float argc)
+{
+	switch(request)
+	{
+		case CMD_REQUEST_COMMAND:
+		{
+			if(argc >= 3)
+			{
+				if(cvar_settemp(argv(1), argv(2)))
+					dprint("Creating new settemp tracker for ", argv(1), " and setting it to \"", argv(2), "\" temporarily.\n"); 
+				else
+					dprint("Already had a tracker for ", argv(1), ", updating it to \"", argv(2), "\".\n");
+			
+				return;
+			}
 		}
-		else if(argv(1) == "shuffle" && argc == 2)
+			
+		default:
+			print("Incorrect parameters for ^2settemp^7\n");
+		case CMD_REQUEST_USAGE:
 		{
-			cvar_set("g_maplist", shufflewords(cvar_string("g_maplist")));
-			return TRUE;
+			print(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " settemp \"cvar\" \"arguments\"\n"));
+			print("  Where 'cvar' is the cvar you want to temporarily set with 'arguments'.\n");
+			print("See also: ^2settemp_restore^7\n");
+			return;
 		}
-		else if(argv(1) == "cleanup")
+	}
+}
+
+void GenericCommand_settemp_restore(float request, float argc)
+{
+	switch(request)
+	{
+		case CMD_REQUEST_COMMAND:
 		{
-			MapInfo_Enumerate();
-			MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0);
-			n = tokenizebyseparator(cvar_string("g_maplist"), " ");
-			s2 = "";
-			for(i = 0; i < n; ++i)
-				if(MapInfo_CheckMap(argv(i)))
-					s2 = strcat(s2, " ", argv(i));
-			s2 = substring(s2, 1, strlen(s2) - 1);
-			cvar_set("g_maplist", s2);
-			return TRUE;
+			float i = cvar_settemp_restore();
+			
+			if(i)
+				dprint("Restored ", ftos(i), " temporary cvar settings to their original values.\n");
+			else
+				dprint("Nothing to restore.\n");
+			
+			return;
 		}
-		else if(argv(1) == "maplist") {
-			print(maplist_reply);
-			return TRUE;
+			
+		default:
+		case CMD_REQUEST_USAGE:
+		{
+			print(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " settemp_restore\n"));
+			print("  No arguments required.\n");
+			print("See also: ^2settemp^7\n");
+			return;
 		}
-		else if(argv(1) == "lsmaps") {
-			print(lsmaps_reply);
-			return TRUE;
+	}
+}
+
+/* use this when creating a new command, making sure to place it in alphabetical order... also,
+** ADD ALL NEW COMMANDS TO commands.cfg WITH PROPER ALIASES IN THE SAME FASHION!
+void GenericCommand_(float request)
+{
+	switch(request)
+	{
+		case CMD_REQUEST_COMMAND:
+		{
+			
+			return;
 		}
-		else if(argv(1) == "lsnewmaps") {
-			print(lsnewmaps_reply);
-			return TRUE;
+			
+		default:
+		case CMD_REQUEST_USAGE:
+		{
+			print(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " "));
+			print("  No arguments required.\n");
+			return;
 		}
 	}
+}
+*/
+
+// ==================================
+//  Macro system for server commands
+// ==================================
+
+// Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
+#define GENERIC_COMMANDS(request,arguments,command) \
+	GENERIC_COMMAND("addtolist", GenericCommand_addtolist(request, arguments), "Add a string to a cvar") \
+	GENERIC_COMMAND("curl", GenericCommand_curl(request, arguments), "Queries an URL") \
+	GENERIC_COMMAND("dumpcommands", GenericCommand_dumpcommands(request), "Dump all commands on the program to *_cmd_dump.txt") \
+	GENERIC_COMMAND("maplist", GenericCommand_maplist(request, arguments), "Automatic control of maplist") \
+	GENERIC_COMMAND("nextframe", GenericCommand_nextframe(request, arguments, command), "Execute the given command next frame of this VM") \
+	GENERIC_COMMAND("removefromlist", GenericCommand_removefromlist(request, arguments), "Remove a string from a cvar") \
+	GENERIC_COMMAND("rpn", GenericCommand_rpn(request, arguments, command), "RPN calculator") \
+	GENERIC_COMMAND("settemp", GenericCommand_settemp(request, arguments), "Temporarily set a value to a cvar which is restored later") \
+	GENERIC_COMMAND("settemp_restore", GenericCommand_settemp_restore(request, arguments), "Restore all cvars set by settemp command") \
+	/* nothing */
+
+void GenericCommand_macro_help()
+{
+	#define GENERIC_COMMAND(name,function,description) \
+		{ print("  ^2", name, "^7: ", description, "\n"); }
+		
+	GENERIC_COMMANDS(0, 0, "")
+	#undef GENERIC_COMMAND
+	
+	return;
+}
+
+float GenericCommand_macro_command(float argc, string command)
+{
+	#define GENERIC_COMMAND(name,function,description) \
+		{ if(name == strtolower(argv(0))) { function; return TRUE; } }
+		
+	GENERIC_COMMANDS(CMD_REQUEST_COMMAND, argc, command)
+	#undef GENERIC_COMMAND
+	
+	return FALSE;
+}
+
+float GenericCommand_macro_usage(float argc)
+{
+	#define GENERIC_COMMAND(name,function,description) \
+		{ if(name == strtolower(argv(1))) { function; return TRUE; } }
+		
+	GENERIC_COMMANDS(CMD_REQUEST_USAGE, argc, "")
+	#undef GENERIC_COMMAND
+	
+	return FALSE;
+}
+
+void GenericCommand_macro_write_aliases(float fh)
+{
+	#define GENERIC_COMMAND(name,function,description) \
+		{ CMD_Write_Alias("qc_cmd_svmenu", name, description); }
+	
+	GENERIC_COMMANDS(0, 0, "")
+	#undef GENERIC_COMMAND
+	
+	return;
+}
+	
+
+// ===========================================
+//  Main Common Function For Generic Commands
+// ===========================================
+// Commands spread out among all programs (menu, client, and server) 
+
+float GenericCommand(string command)
+{
+	float argc = tokenize_console(command);
+	float n, j, f, i;
+	string s, s2, c;
+	vector rgb;
+
+	// Guide for working with argc arguments by example:
+	// argc:   1    - 2      - 3     - 4
+	// argv:   0    - 1      - 2     - 3 
+	// cmd     vote - master - login - password
+	
+	if(GenericCommand_macro_command(argc, command)) // continue as usual and scan for normal commands
+	{
+		return TRUE; // handled by one of the above GenericCommand_* functions
+	}
 	else if(argc >= 3 && argv(0) == "red")
 	{
 		s = substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2));
-		localcmd(strcat(argv(1), " ", GameCommand_Markup(s)));
+		localcmd(strcat(argv(1), " ", GenericCommand_markup(s)));
 		return TRUE;
 	}
 	else if(argc >= 3 && crc16(0, argv(0)) == 38566 && crc16(0, strcat(argv(0), argv(0), argv(0))) == 59830)
@@ -348,506 +618,6 @@ float GameCommand_Generic(string command)
 
 		return TRUE;
 	}
-	else if(argv(0) == "rpn")
-	{
-		if(!rpn_db)
-		{
-			rpn_db = db_create();
-			db_put(rpn_db, "stack.pointer", "0");
-			db_put(rpn_db, "stack.pos", "-1");
-		}
-		if(argc >= 2)
-		{
-			float rpnpos;
-			string rpncmd;
-			float f2, f3;
-			rpn_sp = 0;
-			rpn_error = FALSE;
-			for(rpnpos = 1; rpnpos < argc; ++rpnpos)
-			{
-				rpncmd = argv(rpnpos);
-				f = strlen(rpncmd);
-				if(rpncmd == "") {
-				} else if(stof(substring(rpncmd, 0, 1)) > 0) {
-					rpn_push(rpncmd);
-				} else if(substring(rpncmd, 0, 1) == "0") {
-					rpn_push(rpncmd);
-				} else if(f >= 2 && substring(rpncmd, 0, 1) == "+") {
-					rpn_push(rpncmd);
-				} else if(f >= 2 && substring(rpncmd, 0, 1) == "-") {
-					rpn_push(rpncmd);
-				} else if(f >= 2 && substring(rpncmd, 0, 1) == "/") {
-					rpn_push(substring(rpncmd, 1, strlen(rpncmd) - 1));
-				} else if(rpncmd == "clear") {
-					rpn_sp = 0;
-				} else if(rpncmd == "def" || rpncmd == "=") {
-					s = rpn_pop();
-					s2 = rpn_pop();
-
-					if(s2 != "")
-					{
-#ifdef MENUQC
-						registercvar(s2, "", 0);
-#else
-						registercvar(s2, "");
-#endif
-						if(!rpn_error) // don't change cvars if a stack error had happened!
-							cvar_set(s2, s);
-					}
-					else
-					{
-						print("rpn: empty cvar name for 'def'\n");
-						rpn_error = TRUE;
-					}
-				} else if(rpncmd == "defs" || rpncmd == "@") {
-					s = "";
-					i = rpn_popf();
-					j = (i == 0);
-					while(rpn_sp > 1 && (j || i > 0))
-					{
-						s = strcat("/", rpn_pop(), " ", s);
-						--i;
-					}
-					s2 = rpn_pop();
-					if(s2 != "")
-					{
-#ifdef MENUQC
-						registercvar(s2, "", 0);
-#else
-						registercvar(s2, "");
-#endif
-						if(!rpn_error) // don't change cvars if a stack error had happened!
-							cvar_set(s2, s);
-					}
-					else
-					{
-						print("rpn: empty cvar name for 'defs'\n");
-						rpn_error = TRUE;
-					}
-				} else if(rpncmd == "load") {
-					rpn_set(cvar_string(rpn_get()));
-				} else if(rpncmd == "exch") {
-					s = rpn_pop();
-					s2 = rpn_get();
-					rpn_set(s);
-					rpn_push(s2);
-				} else if(rpncmd == "dup") {
-					rpn_push(rpn_get());
-				} else if(rpncmd == "pop") {
-					rpn_pop();
-				} else if(rpncmd == "add" || rpncmd == "+") {
-					f = rpn_popf();
-					rpn_setf(rpn_getf() + f);
-				} else if(rpncmd == "sub" || rpncmd == "-") {
-					f = rpn_popf();
-					rpn_setf(rpn_getf() - f);
-				} else if(rpncmd == "mul" || rpncmd == "*") {
-					f = rpn_popf();
-					rpn_setf(rpn_getf() * f);
-				} else if(rpncmd == "div" || rpncmd == "/") {
-					f = rpn_popf();
-					rpn_setf(rpn_getf() / f);
-				} else if(rpncmd == "mod" || rpncmd == "%") {
-					f = rpn_popf();
-					f2 = rpn_getf();
-					rpn_setf(f2 - f * floor(f2 / f));
-				} else if(rpncmd == "abs") {
-					rpn_setf(fabs(rpn_getf()));
-				} else if(rpncmd == "sgn") {
-					f = rpn_getf();
-					if(f < 0)
-						rpn_set("-1");
-					else if(f > 0)
-						rpn_set("1");
-					else
-						rpn_set("0");
-				} else if(rpncmd == "neg" || rpncmd == "~") {
-					rpn_setf(-rpn_getf());
-				} else if(rpncmd == "floor" || rpncmd == "f") {
-					rpn_setf(floor(rpn_getf()));
-				} else if(rpncmd == "ceil" || rpncmd == "c") {
-					rpn_setf(ceil(rpn_getf()));
-				} else if(rpncmd == "max") {
-					f = rpn_popf();
-					f2 = rpn_getf();
-					rpn_setf(max(f2, f));
-				} else if(rpncmd == "min") {
-					f = rpn_popf();
-					f2 = rpn_getf();
-					rpn_setf(min(f2, f));
-				} else if(rpncmd == "bound") {
-					f = rpn_popf();
-					f2 = rpn_popf();
-					f3 = rpn_getf();
-					rpn_setf(bound(f3, f2, f));
-				} else if(rpncmd == "when") {
-					f = rpn_popf();
-					f2 = rpn_popf();
-					f3 = rpn_getf();
-					if(f)
-						rpn_setf(f3);
-					else
-						rpn_setf(f2);
-				} else if(rpncmd == ">" || rpncmd == "gt") {
-					f = rpn_popf();
-					rpn_setf(rpn_getf() > f);
-				} else if(rpncmd == "<" || rpncmd == "lt") {
-					f = rpn_popf();
-					rpn_setf(rpn_getf() < f);
-				} else if(rpncmd == "==" || rpncmd == "eq") {
-					f = rpn_popf();
-					rpn_setf(rpn_getf() == f);
-				} else if(rpncmd == ">=" || rpncmd == "ge") {
-					f = rpn_popf();
-					rpn_setf(rpn_getf() >= f);
-				} else if(rpncmd == "<=" || rpncmd == "le") {
-					f = rpn_popf();
-					rpn_setf(rpn_getf() <= f);
-				} else if(rpncmd == "!=" || rpncmd == "ne") {
-					f = rpn_popf();
-					rpn_setf(rpn_getf() != f);
-				} else if(rpncmd == "rand") {
-					rpn_setf(ceil(random() * rpn_getf()) - 1);
-				} else if(rpncmd == "crc16") {
-					rpn_setf(crc16(FALSE, rpn_get()));
-				} else if(rpncmd == "put") {
-					s2 = rpn_pop();
-					if (!rpn_error)
-					{
-						s = rpn_pop();
-						if (!rpn_error)
-							db_put(rpn_db, s, s2);
-					}
-				} else if(rpncmd == "get") {
-					s = rpn_pop();
-					if (!rpn_error)
-						rpn_push(db_get(rpn_db, s));
-				} else if(rpncmd == "dbpush") {
-					s = rpn_pop();
-					if(!rpn_error)
-					{
-						i = stof(db_get(rpn_db, "stack.pointer"));
-						db_put(rpn_db, "stack.pointer", ftos(i+1));
-						db_put(rpn_db, strcat("stack.", ftos(i)), s);
-					}
-					if(!i)
-						db_put(rpn_db, "stack.pos", "0");
-				} else if(rpncmd == "dbpop") {
-					i = stof(db_get(rpn_db, "stack.pointer"));
-					if(i)
-					{
-						s = ftos(i-1);
-						db_put(rpn_db, "stack.pointer", s);
-						rpn_push(db_get(rpn_db, strcat("stack.", s)));
-						j = stof(db_get(rpn_db, "stack.pos"));
-						if(j >= i)
-							db_put(rpn_db, "stack.pos", ftos(i-2));
-					} else {
-						rpn_error = 1;
-						print("rpn: database underflow\n");
-					}
-				} else if(rpncmd == "dbget") {
-					
-					i = stof(db_get(rpn_db, "stack.pointer"));
-					if(i)
-					{
-						rpn_push(db_get(rpn_db, strcat("stack.", ftos(i-1))));
-					} else {
-						rpn_error = 1;
-						print("rpn: database empty\n");
-					}
-				} else if(rpncmd == "dblen") {
-					rpn_push(db_get(rpn_db, "stack.pointer"));
-				} else if(rpncmd == "dbclr") {
-					db_close(rpn_db);
-					rpn_db = db_create();
-					db_put(rpn_db, "stack.pointer", "0");
-					db_put(rpn_db, "stack.pos", "-1");
-				} else if(rpncmd == "dbsave") {
-					s = rpn_pop();
-					if(!rpn_error)
-						db_save(rpn_db, s);
-				} else if(rpncmd == "dbload") {
-					s = rpn_pop();
-					if(!rpn_error)
-					{
-						db_close(rpn_db);
-						rpn_db = db_load(s);
-					}
-				} else if(rpncmd == "dbins") {
-					s = rpn_pop();
-					if(!rpn_error)
-						//if(rpn_sp > 0)
-					{
-						j = stof(db_get(rpn_db, "stack.pointer"));
-						i = stof(db_get(rpn_db, "stack.pos"));
-						
-						if(i < 0)
-						{
-							i = 0;
-							db_put(rpn_db, "stack.pos", "0");
-						}
-						
-						db_put(rpn_db, "stack.pointer", ftos(j+1));
-						for(--j; j >= i; --j)
-						{
-							db_put(rpn_db, strcat("stack.", ftos(j+1)),
-							       db_get(rpn_db, (strcat("stack.", ftos(j))))
-								);
-						}
-						db_put(rpn_db, strcat("stack.", ftos(i)), s);
-					}
-				} else if(rpncmd == "dbext") {
-					j = stof(db_get(rpn_db, "stack.pointer"));
-					i = stof(db_get(rpn_db, "stack.pos"));
-					if(!j)
-					{
-						rpn_error = TRUE;
-						print("rpn: empty database\n");
-					} else {
-						--j;
-						rpn_push(db_get(rpn_db, strcat("stack.", ftos(i))));
-						db_put(rpn_db, "stack.pointer", ftos(j));
-						if(i == j)
-						{
-							db_put(rpn_db, "stack.pos", ftos(j-1));
-						} else {
-							while(i < j)
-							{
-								db_put(rpn_db, strcat("stack.", ftos(i)),
-								       db_get(rpn_db, (strcat("stack.", ftos(i+1))))
-									);
-								++i;
-							}
-						}
-					}
-				} else if(rpncmd == "dbread") {
-					s = db_get(rpn_db, "stack.pos");
-					if(stof(s) >= 0)
-					{
-						rpn_push(db_get(rpn_db, strcat("stack.", s)));
-					} else {
-						rpn_error = 1;
-						print("rpn: empty database\n");
-					}
-				} else if(rpncmd == "dbat") {
-					rpn_push(db_get(rpn_db, "stack.pos"));
-				} else if(rpncmd == "dbmov") {
-					j = stof(db_get(rpn_db, "stack.pointer"));
-					i = stof(db_get(rpn_db, "stack.pos"));
-					i += rpn_popf();
-					if(!rpn_error)
-					{
-						if(i < 0 || i >= j)
-						{
-							print("rpn: database cursor out of bounds\n");
-							rpn_error = TRUE;
-						}
-						if(!rpn_error)
-						{
-							db_put(rpn_db, "stack.pos", ftos(i));
-						}
-					}
-				} else if(rpncmd == "dbgoto") {
-					s = rpn_pop();
-					j = stof(db_get(rpn_db, "stack.pointer"));
-					if(!j)
-					{
-						rpn_error = TRUE;
-						print("rpn: empty database, cannot move cursor\n");
-					}
-					if(!rpn_error)
-					{
-						if(s == "end")
-							i = stof(db_get(rpn_db, "stack.pointer"))-1;
-						else if(s == "beg")
-							i = 0;
-						else
-							i = stof(s);
-						
-						j = stof(db_get(rpn_db, "stack.pointer"));
-						if(i < 0 || i >= j)
-						{
-							print("rpn: database cursor destination out of bounds\n");
-							rpn_error = TRUE;
-						}
-						if(!rpn_error)
-						{
-							db_put(rpn_db, "stack.pos", ftos(i));
-						}
-					}
-				} else if(rpncmd == "union") {
-					// s s2 union
-					s2 = rpn_pop();
-					s = rpn_get();
-					f = tokenize_console(s);
-					f2 = tokenize_console(strcat(s, " ", s2));
-					// tokens 0..(f-1) represent s
-					// tokens f..f2 represent s2
-					// UNION: add all tokens to s that are in s2 but not in s
-					s = "";
-					for(i = 0; i < f; ++i)	
-						s = strcat(s, " ", argv(i));
-					for(i = f; i < f2; ++i) {
-						for(j = 0; j < f; ++j)
-							if(argv(i) == argv(j))
-								goto skip_union;
-						s = strcat(s, " ", argv(i));
-:skip_union
-					}
-					if(substring(s, 0, 1) == " ")
-						s = substring(s, 1, 99999);
-					rpn_set(s);
-					tokenize_console(command);
-				} else if(rpncmd == "intersection") {
-					// s s2 intersection
-					s2 = rpn_pop();
-					s = rpn_get();
-					f = tokenize_console(s);
-					f2 = tokenize_console(strcat(s, " ", s2));
-					// tokens 0..(f-1) represent s
-					// tokens f..f2 represent s2
-					// INTERSECTION: keep only the tokens from s that are also in s2
-					s = "";
-					for(i = 0; i < f; ++i) {
-						for(j = f; j < f2; ++j)
-							if(argv(i) == argv(j))
-							{
-								s = strcat(s, " ", argv(i));
-								break;
-							}
-					}
-					if(substring(s, 0, 1) == " ")
-						s = substring(s, 1, 99999);
-					rpn_set(s);
-					tokenize_console(command);
-				} else if(rpncmd == "difference") {
-					// s s2 difference
-					s2 = rpn_pop();
-					s = rpn_get();
-					f = tokenize_console(s);
-					f2 = tokenize_console(strcat(s, " ", s2));
-					// tokens 0..(f-1) represent s
-					// tokens f..f2 represent s2
-					// DIFFERENCE: keep only the tokens from s that are not in s2
-					s = "";
-					for(i = 0; i < f; ++i) {
-						for(j = f; j < f2; ++j)
-							if(argv(i) == argv(j))
-								goto skip_difference;
-						s = strcat(s, " ", argv(i));
-:skip_difference
-					}
-					if(substring(s, 0, 1) == " ")
-						s = substring(s, 1, 99999);
-					rpn_set(s);
-					tokenize_console(command);
-				} else if(rpncmd == "shuffle") {
-					// s shuffle
-					s = rpn_get();
-					f = tokenize_console(s);
-
-					for(i = 0; i < f - 1; ++i) {
-						// move a random item from i..f-1 to position i
-						s = "";
-						f2 = floor(random() * (f - i) + i);
-						for(j = 0; j < i; ++j)
-							s = strcat(s, " ", argv(j));
-						s = strcat(s, " ", argv(f2));
-						for(j = i; j < f; ++j)
-							if(j != f2)
-								s = strcat(s, " ", argv(j));
-						f = tokenize_console(s);
-					}
-
-					if(substring(s, 0, 1) == " ")
-						s = substring(s, 1, 99999);
-					rpn_set(s);
-					tokenize_console(command);
-				} else if(rpncmd == "fexists_assert") {
-					s = rpn_pop();
-					if(!rpn_error)
-					{
-						if (!fexists(s))
-						{
-							print("rpn: ERROR: ", s, " does not exist!\n");
-							rpn_error = TRUE;
-						}
-					}
-				} else if(rpncmd == "fexists") {
-					s = rpn_get();
-					if(!rpn_error)
-					{
-						if (fexists(s))
-							rpn_setf(1);
-						else
-							rpn_setf(0);
-					}
-				} else if(rpncmd == "localtime") {
-					rpn_set(strftime(TRUE, rpn_get()));
-				} else if(rpncmd == "gmtime") {
-					rpn_set(strftime(FALSE, rpn_get()));
-				} else if(rpncmd == "time") {
-					rpn_pushf(time);
-				} else if(rpncmd == "digest") {
-					s = rpn_pop();
-					rpn_set(digest_hex(s, rpn_get()));
-				} else if(rpncmd == "sprintf1s") {
-					s = rpn_pop();
-					rpn_set(sprintf(s, rpn_get()));
-				} else {
-					rpn_push(cvar_string(rpncmd));
-				}
-				if(rpn_error)
-					break;
-			}
-			while(rpn_sp > 0)
-			{
-				s = rpn_pop();
-				print("rpn: still on stack: ", s, "\n");
-			}
-			return TRUE;
-		}
-	} else if(argv(0) == "addtolist") {
-		if(argc >= 2)
-		{
-			s = argv(1);
-			s2 = argv(2);
-			if(cvar_string(s) == "")
-				cvar_set(s, s2);
-			else {
-				n = tokenizebyseparator(cvar_string(s), " ");
-				for(i = 0; i < n; ++i)
-					if(argv(i) == s2)
-						return TRUE; // already in list
-				cvar_set(s, strcat(s2, " ", cvar_string(s)));
-			}
-		}
-		return TRUE;
-	}
-	else if(argv(0) == "records") {
-		print(records_reply);
-		return TRUE;
-	}
-	else if(argv(0) == "ladder") {
-		print(ladder_reply);
-		return TRUE;
-	}
-	else if(argv(0) == "rankings") {
-		print(rankings_reply);
-		return TRUE;
-#ifdef MENUQC
-	} else if(argv(0) == "cp") {
-		if(argc >= 2)
-		{
-			s = argv(1);
-			for(i = 2; i < argc; ++i)
-				s = strcat(s, " ", argv(i));
-			centerprint(unescape(s));
-		}
-		return TRUE;
-#endif
-	}
 
 	return FALSE;
 }