X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cmd.c;h=0df09105fc1f020d45b2ecf4cceffa90a3931410;hp=29eef47b443ea40389d77f2985c6b32426e53fd6;hb=HEAD;hpb=626658074c8dd5c2288becd836103e2efdb9b741

diff --git a/cmd.c b/cmd.c
index 29eef47b..110378ff 100644
--- a/cmd.c
+++ b/cmd.c
@@ -22,9 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 #include "thread.h"
 
-cmd_state_t cmd_client;
-cmd_state_t cmd_server;
-cmd_state_t cmd_serverfromclient;
+cmd_state_t *cmd_local;
+cmd_state_t *cmd_serverfromclient;
 
 cmd_userdefined_t cmd_userdefined_all;
 cmd_userdefined_t cmd_userdefined_null;
@@ -34,13 +33,9 @@ typedef struct cmd_iter_s {
 }
 cmd_iter_t;
 
-static cmd_iter_t cmd_iter_all[] = {
-	{&cmd_client},
-	{&cmd_server},
-	{&cmd_serverfromclient},
-	{NULL},
-};
+static cmd_iter_t *cmd_iter_all;
 
+mempool_t *cbuf_mempool;
 
 // we only run the +whatever commandline arguments once
 qbool host_stuffcmdsrun = false;
@@ -79,43 +74,40 @@ Cmd_Defer_f
 Cause a command to be executed after a delay.
 ============
 */
-static cmd_input_t *Cbuf_LinkGet(cmd_buf_t *cbuf, cmd_input_t *existing);
+static void Cbuf_ParseText(cmd_state_t *cmd, llist_t *head, cmd_input_t *existing, const char *text, qbool allowpending);
+static void Cbuf_LinkString(cmd_state_t *cmd, llist_t *head, cmd_input_t *existing, const char *text, qbool leavepending, unsigned int cmdsize);
 static void Cmd_Defer_f (cmd_state_t *cmd)
 {
 	cmd_input_t *current;
 	cmd_buf_t *cbuf = cmd->cbuf;
+	unsigned int cmdsize;
 
 	if(Cmd_Argc(cmd) == 1)
 	{
-		if(List_IsEmpty(&cbuf->deferred))
+		if(List_Is_Empty(&cbuf->deferred))
 			Con_Printf("No commands are pending.\n");
 		else
 		{
-			llist_t *pos;
-        	List_ForEach(pos, &cbuf->deferred)
-    		{
-				current = List_Container(*pos, cmd_input_t, list);
+			List_For_Each_Entry(current, &cbuf->deferred, cmd_input_t, list)
 				Con_Printf("-> In %9.2f: %s\n", current->delay, current->text);
-			}
 		}
 	}
 	else if(Cmd_Argc(cmd) == 2 && !strcasecmp("clear", Cmd_Argv(cmd, 1)))
 	{
-		while(!List_IsEmpty(&cbuf->deferred))
+		while(!List_Is_Empty(&cbuf->deferred))
+		{
+			cbuf->size -= List_Entry(cbuf->deferred.next, cmd_input_t, list)->length;
 			List_Move_Tail(cbuf->deferred.next, &cbuf->free);
+		}
 	}
-	else if(Cmd_Argc(cmd) == 3)
+	else if(Cmd_Argc(cmd) == 3 && (cmdsize = strlen(Cmd_Argv(cmd, 2))) )
 	{
-		const char *text = Cmd_Argv(cmd, 2);
-		current = Cbuf_LinkGet(cbuf, NULL);
-		current->size = strlen(text);
-		current->source = cmd;
-		current->delay = atof(Cmd_Argv(cmd, 1));
+		Cbuf_Lock(cbuf);
 
-		memcpy(current->text, text, current->size + 1);
-
-		List_Move_Tail(&current->list, &cbuf->deferred);
+		Cbuf_LinkString(cmd, &cbuf->deferred, NULL, Cmd_Argv(cmd, 2), false, cmdsize);
+		List_Entry(cbuf->deferred.prev, cmd_input_t, list)->delay = atof(Cmd_Argv(cmd, 1));
 
+		Cbuf_Unlock(cbuf);
 	}
 	else
 	{
@@ -125,217 +117,141 @@ static void Cmd_Defer_f (cmd_state_t *cmd)
 	}
 }
 
-/*
-============
-Cmd_Centerprint_f
-
-Print something to the center of the screen using SCR_Centerprint
-============
-*/
-static void Cmd_Centerprint_f (cmd_state_t *cmd)
-{
-	char msg[MAX_INPUTLINE];
-	unsigned int i, c, p;
-	c = Cmd_Argc(cmd);
-	if(c >= 2)
-	{
-		strlcpy(msg, Cmd_Argv(cmd,1), sizeof(msg));
-		for(i = 2; i < c; ++i)
-		{
-			strlcat(msg, " ", sizeof(msg));
-			strlcat(msg, Cmd_Argv(cmd, i), sizeof(msg));
-		}
-		c = (unsigned int)strlen(msg);
-		for(p = 0, i = 0; i < c; ++i)
-		{
-			if(msg[i] == '\\')
-			{
-				if(msg[i+1] == 'n')
-					msg[p++] = '\n';
-				else if(msg[i+1] == '\\')
-					msg[p++] = '\\';
-				else {
-					msg[p++] = '\\';
-					msg[p++] = msg[i+1];
-				}
-				++i;
-			} else {
-				msg[p++] = msg[i];
-			}
-		}
-		msg[p] = '\0';
-		SCR_CenterPrint(msg);
-	}
-}
-
 /*
 =============================================================================
 
 						COMMAND BUFFER
 
+ * The Quake command-line is super basic. It can be entered in the console
+ * or in config files. A semicolon is used to terminate a command and chain
+ * them together. Otherwise, a newline delineates command input.
+ *
+ * In most engines, the Quake command-line is a simple linear text buffer that
+ * is parsed when it executes. In Darkplaces, we use a linked list of command
+ * input and parse the input on the spot.
+ *
+ * This was done because Darkplaces allows multiple command interpreters on the
+ * same thread. Previously, each interpreter maintained its own buffer and this
+ * caused problems related to execution order, and maintaining a single simple
+ * buffer for all interpreters makes it non-trivial to keep track of which
+ * command should execute on which interpreter.
+
 =============================================================================
 */
 
-static cmd_input_t *Cbuf_LinkGet(cmd_buf_t *cbuf, cmd_input_t *existing)
+/*
+============
+Cbuf_NodeGet
+
+Returns an existing buffer node for appending or reuse, or allocates a new one
+============
+*/
+static cmd_input_t *Cbuf_NodeGet(cmd_buf_t *cbuf, cmd_input_t *existing)
 {
-	cmd_input_t *ret = NULL;
+	cmd_input_t *node;
 	if(existing && existing->pending)
-		ret = existing;
-	else if(!List_IsEmpty(&cbuf->free))
+		node = existing;
+	else if(!List_Is_Empty(&cbuf->free))
 	{
-		ret = List_Container(*cbuf->free.next, cmd_input_t, list);
-		ret->length = 0;
-		ret->pending = false;
+		node = List_Entry(cbuf->free.next, cmd_input_t, list);
+		node->length = node->pending = 0;
+	}
+	else
+	{
+		node = (cmd_input_t *)Mem_Alloc(cbuf_mempool, sizeof(cmd_input_t));
+		node->list.prev = node->list.next = &node->list;
+		node->size = node->length = node->pending = 0;
 	}
-	return ret;
-}
-
-static cmd_input_t *Cmd_AllocInputNode(void)
-{
-	cmd_input_t *node = (cmd_input_t *)Z_Malloc(sizeof(cmd_input_t));
-	node->list.prev = node->list.next = &node->list;
-	node->size = node->length = node->pending = 0;
 	return node;
 }
 
-static size_t Cmd_ParseInput (cmd_input_t **output, char **input)
-{
-	size_t pos, cmdsize = 0, start = 0;
-	qbool command = false, lookahead = false;
-	qbool quotes = false, comment = false;
-	qbool escaped = false;
-
-	/*
-	 * The Quake command-line is super basic. It can be entered in the console
-	 * or in config files. A semicolon is used to terminate a command and chain
-	 * them together. Otherwise, a newline delineates command input.
-	 * 
-	 * In most engines, the Quake command-line is a simple linear text buffer that
-	 * is parsed when it executes. In Darkplaces, we use a linked list of command
-	 * input and parse the input on the spot.
-	 * 
-	 * This was done because Darkplaces allows multiple command interpreters on the
-	 * same thread. Previously, each interpreter maintained its own buffer and this
-	 * caused problems related to execution order, and maintaining a single simple
-	 * buffer for all interpreters makes it non-trivial to keep track of which
-	 * command should execute on which interpreter.
-	 */
-
-	// Run until command and lookahead are both true, or until we run out of input.
-	for (pos = 0; (*input)[pos]; pos++)
-	{
-		// Look for newlines and semicolons. Ignore semicolons in quotes.
-		switch((*input)[pos])
-		{
-		case '\r':
-		case '\n':
-			command = false;
-			comment = false;
-			break;
-		default: 
-			if(!comment) // Not a newline so far. Still not a valid command yet.
-			{
-				if(!quotes && (*input)[pos] == ';') // Ignore semicolons in quotes.
-					command = false;
-				else if (ISCOMMENT((*input), pos)) // Comments
-				{
-					comment = true;
-					command = false;
-				}
-				else
-				{
-					command = true;
-					if(!lookahead)
-					{
-						if(!cmdsize)
-							start = pos;
-						cmdsize++;
-					}
+/*
+============
+Cbuf_LinkString
 
-					switch((*input)[pos])
-					{
-					case '"':
-						if (!escaped)
-							quotes = !quotes;
-						else
-							escaped = false;
-						break;
-					case '\\':
-						if (!escaped && quotes)
-							escaped = true;
-						else if (escaped)
-							escaped = false;
-						break;
-					}
-				}
-			}
-		}
-		if(cmdsize && !command)
-			lookahead = true;
+Copies a command string into a buffer node.
+The input should not be null-terminated, the output will be.
+============
+*/
+static void Cbuf_LinkString(cmd_state_t *cmd, llist_t *head, cmd_input_t *existing, const char *text, qbool leavepending, unsigned int cmdsize)
+{
+	cmd_buf_t *cbuf = cmd->cbuf;
+	cmd_input_t *node = Cbuf_NodeGet(cbuf, existing);
+	unsigned int offset = node->length; // > 0 if(pending)
 
-		if(command && lookahead)
-			break;
+	// node will match existing if its text was pending continuation
+	if(node != existing)
+	{
+		node->source = cmd;
+		List_Move_Tail(&node->list, head);
 	}
 
-	if(cmdsize)
+	node->length += cmdsize;
+	if(node->size < node->length)
 	{
-		size_t offset = 0;
-
-		if(!*output)
-			*output = Cmd_AllocInputNode();
-
-		if((*output)->pending)
-			offset = (*output)->length;
-
-		(*output)->length += cmdsize;
-
-		if((*output)->size < (*output)->length + 1)
-		{
-			(*output)->text = (char *)Mem_Realloc(tempmempool, (*output)->text, (*output)->size + cmdsize + 1);
-			(*output)->size = (*output)->length + 1;
-		}
-
-		strlcpy(&(*output)->text[offset], &(*input)[start], cmdsize + 1);
-		(*output)->pending = !lookahead;
+		node->text = (char *)Mem_Realloc(cbuf_mempool, node->text, node->length + 1);
+		node->size = node->length;
 	}
+	cbuf->size += cmdsize;
 
-	// Set input to its new position. Can be NULL.
-	*input = &(*input)[pos];
-
-	return cmdsize;
+	dp_ustr2stp(&node->text[offset], node->length + 1, text, cmdsize);
+	//Con_Printf("^5Cbuf_LinkString(): %s `^7%s^5`\n", node->pending ? "append" : "new", &node->text[offset]);
+	node->pending = leavepending;
 }
 
-// Cloudwalk: Not happy with this, but it works.
-static void Cbuf_LinkCreate(cmd_state_t *cmd, llist_t *head, cmd_input_t *existing, const char *text)
+/*
+============
+Cbuf_ParseText
+
+Parses text to isolate command strings for linking into the buffer
+separators: \n \r or unquoted and uncommented ';'
+============
+*/
+static void Cbuf_ParseText(cmd_state_t *cmd, llist_t *head, cmd_input_t *existing, const char *text, qbool allowpending)
 {
-	char *in = (char *)&text[0];
-	cmd_buf_t *cbuf = cmd->cbuf;
-	size_t totalsize = 0, newsize = 0;
-	cmd_input_t *current = NULL;
+	unsigned int cmdsize = 0, start = 0, pos;
+	qbool quotes = false, comment = false;
 
-	// Slide the pointer down until we reach the end
-	while(*in)
+	for (pos = 0; text[pos]; ++pos)
 	{
-		current = Cbuf_LinkGet(cbuf, existing);
-		newsize = Cmd_ParseInput(&current, &in);
-
-		// Valid command
-		if(newsize)
+		switch(text[pos])
 		{
-			if(current != existing)
-			{
-				current->source = cmd;
-				List_Move_Tail(&current->list, head);
-			}
+			case ';':
+				if (comment || quotes)
+					break;
+			case '\r':
+			case '\n':
+				comment = false;
+				quotes = false; // matches div0-stable
+				if (cmdsize)
+				{
+					Cbuf_LinkString(cmd, head, existing, &text[start], false, cmdsize);
+					cmdsize = 0;
+				}
+				else if (existing && existing->pending) // all I got was this lousy \n
+					existing->pending = false;
+				continue; // don't increment cmdsize
+
+			case '/':
+				if (!quotes && text[pos + 1] == '/' && (pos == 0 || ISWHITESPACE(text[pos - 1])))
+					comment = true;
+				break;
+			case '"':
+				if (!comment && (pos == 0 || text[pos - 1] != '\\'))
+					quotes = !quotes;
+				break;
+		}
 
-			totalsize += newsize;
+		if (!comment)
+		{
+			if (!cmdsize)
+				start = pos;
+			++cmdsize;
 		}
-		else if (current == existing && !totalsize)
-			current->pending = false;
-		current = NULL;
 	}
 
-	cbuf->size += totalsize;
+	if (cmdsize) // the line didn't end yet but we do have a string
+		Cbuf_LinkString(cmd, head, existing, &text[start], allowpending, cmdsize);
 }
 
 /*
@@ -351,16 +267,18 @@ void Cbuf_AddText (cmd_state_t *cmd, const char *text)
 	cmd_buf_t *cbuf = cmd->cbuf;
 	llist_t llist = {&llist, &llist};
 
-	Cbuf_Lock(cbuf);
-
-	if (cbuf->maxsize - cbuf->size <= l)
-		Con_Print("Cbuf_AddText: overflow\n");
-	else
+	if (cbuf->size + l > cbuf->maxsize)
 	{
-		Cbuf_LinkCreate(cmd, &llist, (List_IsEmpty(&cbuf->start) ? NULL : List_Container(*cbuf->start.prev, cmd_input_t, list)), text);
-		if(!List_IsEmpty(&llist))
-			List_Splice_Tail(&llist, &cbuf->start);
+		Con_Printf(CON_WARN "Cbuf_AddText: input too large, %luKB ought to be enough for anybody.\n", (unsigned long)(cbuf->maxsize / 1024));
+		return;
 	}
+
+	Cbuf_Lock(cbuf);
+
+	// If the string terminates but the (last) line doesn't, the node will be left in the pending state (to be continued).
+	Cbuf_ParseText(cmd, &llist, (List_Is_Empty(&cbuf->start) ? NULL : List_Entry(cbuf->start.prev, cmd_input_t, list)), text, true);
+	List_Splice_Tail(&llist, &cbuf->start);
+
 	Cbuf_Unlock(cbuf);
 }
 
@@ -369,7 +287,6 @@ void Cbuf_AddText (cmd_state_t *cmd, const char *text)
 Cbuf_InsertText
 
 Adds command text immediately after the current command
-FIXME: actually change the command buffer to do less copying
 ============
 */
 void Cbuf_InsertText (cmd_state_t *cmd, const char *text)
@@ -378,18 +295,20 @@ void Cbuf_InsertText (cmd_state_t *cmd, const char *text)
 	llist_t llist = {&llist, &llist};
 	size_t l = strlen(text);
 
-	Cbuf_Lock(cbuf);
-
-	// we need to memmove the existing text and stuff this in before it...
-	if (cbuf->size + l >= (size_t)cbuf->maxsize)
-		Con_Print("Cbuf_InsertText: overflow\n");
-	else
+	if (cbuf->size + l > cbuf->maxsize)
 	{
-		Cbuf_LinkCreate(cmd, &llist, List_Container(*cbuf->start.next, cmd_input_t, list), text);
-		if(!List_IsEmpty(&llist))
-			List_Splice(&llist, &cbuf->start);
+		Con_Printf(CON_WARN "Cbuf_InsertText: input too large, %luKB ought to be enough for anybody.\n", (unsigned long)(cbuf->maxsize / 1024));
+		return;
 	}
 
+	Cbuf_Lock(cbuf);
+
+	// bones_was_here assertion: when prepending to the buffer it never makes sense to leave node(s) in the `pending` state,
+	// it would have been impossible to append to such text later in the old raw text buffer,
+	// and allowing it causes bugs when .cfg files lack \n at EOF (see: https://gitlab.com/xonotic/darkplaces/-/issues/378).
+	Cbuf_ParseText(cmd, &llist, (List_Is_Empty(&cbuf->start) ? NULL : List_Entry(cbuf->start.next, cmd_input_t, list)), text, false);
+	List_Splice(&llist, &cbuf->start);
+
 	Cbuf_Unlock(cbuf);
 }
 
@@ -400,27 +319,25 @@ Cbuf_Execute_Deferred --blub
 */
 static void Cbuf_Execute_Deferred (cmd_buf_t *cbuf)
 {
-	llist_t *pos;
-	cmd_input_t *current;
-	double eat;
+	cmd_input_t *current, *n;
+	vec_t eat;
 
 	if (host.realtime - cbuf->deferred_oldtime < 0 || host.realtime - cbuf->deferred_oldtime > 1800)
 		cbuf->deferred_oldtime = host.realtime;
 	eat = host.realtime - cbuf->deferred_oldtime;
-	if (eat < (1.0 / 120.0))
+	if (eat < 1.0/128.0)
 		return;
 	cbuf->deferred_oldtime = host.realtime;
 
-    List_ForEach(pos, &cbuf->deferred)
+	List_For_Each_Entry_Safe(current, n, &cbuf->deferred, cmd_input_t, list)
 	{
-		current = List_Container(*pos, cmd_input_t, list);
 		current->delay -= eat;
 		if(current->delay <= 0)
 		{
-			cbuf->size += current->size;
-			List_Move(pos, &cbuf->start);
-			// We must return and come back next frame or the engine will freeze. Fragile... like glass :3
-			return;
+			Cbuf_AddText(current->source, current->text); // parse deferred string and append its cmdstring(s)
+			List_Entry(cbuf->start.prev, cmd_input_t, list)->pending = false; // faster than div0-stable's Cbuf_AddText(";\n");
+			List_Move_Tail(&current->list, &cbuf->free); // make deferred string memory available for reuse
+			cbuf->size -= current->length;
 		}
 	}
 }
@@ -430,28 +347,24 @@ static void Cbuf_Execute_Deferred (cmd_buf_t *cbuf)
 Cbuf_Execute
 ============
 */
-static qbool Cmd_PreprocessString(cmd_state_t *cmd, const char *intext, char *outtext, unsigned maxoutlen, cmd_alias_t *alias );
+extern qbool prvm_runawaycheck;
 void Cbuf_Execute (cmd_buf_t *cbuf)
 {
 	cmd_input_t *current;
-	char preprocessed[MAX_INPUTLINE];
-	char *firstchar;
+	unsigned int i = 0;
 
 	// LadyHavoc: making sure the tokenizebuffer doesn't get filled up by repeated crashes
 	cbuf->tokenizebufferpos = 0;
 
-	while (!List_IsEmpty(&cbuf->start))
+	while (!List_Is_Empty(&cbuf->start))
 	{
 		/*
 		 * Delete the text from the command buffer and move remaining
 		 * commands down. This is necessary because commands (exec, alias)
 		 * can insert data at the beginning of the text buffer
 		 */
-		current = List_Container(*cbuf->start.next, cmd_input_t, list);
-		
-		// Recycle memory so using WASD doesn't cause a malloc and free
-		List_Move_Tail(&current->list, &cbuf->free);
-		
+		current = List_Entry(cbuf->start.next, cmd_input_t, list);
+
 		/*
 		 * Assume we're rolling with the current command-line and
 		 * always set this false because alias expansion or cbuf insertion
@@ -459,24 +372,10 @@ void Cbuf_Execute (cmd_buf_t *cbuf)
 		 */
 		current->pending = false;
 
+		Cmd_PreprocessAndExecuteString(current->source, current->text, current->length, src_local, false);
 		cbuf->size -= current->length;
-
-		firstchar = current->text;
-		while(*firstchar && ISWHITESPACE(*firstchar))
-			++firstchar;
-		if((strncmp(firstchar, "alias", 5)   || !ISWHITESPACE(firstchar[5])) &&
-		   (strncmp(firstchar, "bind", 4)    || !ISWHITESPACE(firstchar[4])) &&
-		   (strncmp(firstchar, "in_bind", 7) || !ISWHITESPACE(firstchar[7])))
-		{
-			if(Cmd_PreprocessString(current->source, current->text, preprocessed, sizeof(preprocessed), NULL ))
-				Cmd_ExecuteString(current->source, preprocessed, src_local, false);
-		}
-		else
-		{
-			Cmd_ExecuteString (current->source, current->text, src_local, false);
-		}
-
-		current = NULL;
+		// Recycle memory so using WASD doesn't cause a malloc and free
+		List_Move_Tail(&current->list, &cbuf->free);
 
 		if (cbuf->wait)
 		{
@@ -487,11 +386,42 @@ void Cbuf_Execute (cmd_buf_t *cbuf)
 			cbuf->wait = false;
 			break;
 		}
+
+		if (++i == 1000000 && prvm_runawaycheck)
+		{
+			Con_Printf(CON_WARN "Cbuf_Execute: runaway loop counter hit limit of %d commands, clearing command buffers!\n", i);
+			Cbuf_Clear(cbuf);
+		}
+	}
+}
+
+/*
+===================
+Cbuf_Frame_Input
+
+Add them exactly as if they had been typed at the console
+===================
+*/
+static void Cbuf_Frame_Input(void)
+{
+	char *line;
+
+	if ((line = Sys_ConsoleInput()))
+	{
+		// bones_was_here: prepending allows a loop such as `alias foo "bar; wait; foo"; foo`
+		// to be broken with an alias or unalias command
+		Cbuf_InsertText(cmd_local, line);
 	}
 }
 
 void Cbuf_Frame(cmd_buf_t *cbuf)
 {
+	// check for commands typed to the host
+	Cbuf_Frame_Input();
+
+//	R_TimeReport("preconsole");
+
+	// execute commands queued with the defer command
 	Cbuf_Execute_Deferred(cbuf);
 	if (cbuf->size)
 	{
@@ -499,6 +429,17 @@ void Cbuf_Frame(cmd_buf_t *cbuf)
 		Cbuf_Execute(cbuf);
 		SV_UnlockThreadMutex();
 	}
+
+//	R_TimeReport("console");
+}
+
+void Cbuf_Clear(cmd_buf_t *cbuf)
+{
+	while (!List_Is_Empty(&cbuf->start))
+		List_Move_Tail(cbuf->start.next, &cbuf->free);
+	while (!List_Is_Empty(&cbuf->deferred))
+		List_Move_Tail(cbuf->deferred.next, &cbuf->free);
+	cbuf->size = 0;
 }
 
 /*
@@ -590,7 +531,7 @@ static void Cmd_Exec(cmd_state_t *cmd, const char *filename)
 	f = (char *)FS_LoadFile (filename, tempmempool, false, NULL);
 	if (!f)
 	{
-		Con_Printf("couldn't exec %s\n",filename);
+		Con_Printf(CON_WARN "couldn't exec %s\n",filename);
 		return;
 	}
 	Con_Printf("execing %s\n",filename);
@@ -607,160 +548,45 @@ static void Cmd_Exec(cmd_state_t *cmd, const char *filename)
 	if (isdefaultcfg)
 	{
 		// special defaults for specific games go here, these execute before default.cfg
-		// Nehahra pushable crates malfunction in some levels if this is on
-		// Nehahra NPC AI is confused by blowupfallenzombies
+		// and after gamegroup defaults (see below)
 		switch(gamemode)
 		{
-		case GAME_NORMAL:
-			Cbuf_InsertText(cmd, "\n"
-"sv_gameplayfix_blowupfallenzombies 0\n"
-"sv_gameplayfix_findradiusdistancetobox 0\n"
-"sv_gameplayfix_grenadebouncedownslopes 0\n"
-"sv_gameplayfix_slidemoveprojectiles 0\n"
-"sv_gameplayfix_upwardvelocityclearsongroundflag 0\n"
-"sv_gameplayfix_setmodelrealbox 0\n"
-"sv_gameplayfix_droptofloorstartsolid 0\n"
-"sv_gameplayfix_droptofloorstartsolid_nudgetocorrect 0\n"
-"sv_gameplayfix_noairborncorpse 0\n"
-"sv_gameplayfix_noairborncorpse_allowsuspendeditems 0\n"
-"sv_gameplayfix_easierwaterjump 0\n"
-"sv_gameplayfix_delayprojectiles 0\n"
-"sv_gameplayfix_multiplethinksperframe 0\n"
-"sv_gameplayfix_fixedcheckwatertransition 0\n"
-"sv_gameplayfix_q1bsptracelinereportstexture 0\n"
-"sv_gameplayfix_swiminbmodels 0\n"
-"sv_gameplayfix_downtracesupportsongroundflag 0\n"
-"sys_ticrate 0.01388889\n"
-"r_shadow_gloss 1\n"
-"r_shadow_bumpscale_basetexture 0\n"
-"csqc_polygons_defaultmaterial_nocullface 0\n"
-				);
-			break;
 		case GAME_NEHAHRA:
 			Cbuf_InsertText(cmd, "\n"
-"sv_gameplayfix_blowupfallenzombies 0\n"
-"sv_gameplayfix_findradiusdistancetobox 0\n"
-"sv_gameplayfix_grenadebouncedownslopes 0\n"
-"sv_gameplayfix_slidemoveprojectiles 0\n"
+// Nehahra pushable crates malfunction in some levels if this is on
 "sv_gameplayfix_upwardvelocityclearsongroundflag 0\n"
-"sv_gameplayfix_setmodelrealbox 0\n"
-"sv_gameplayfix_droptofloorstartsolid 0\n"
-"sv_gameplayfix_droptofloorstartsolid_nudgetocorrect 0\n"
-"sv_gameplayfix_noairborncorpse 0\n"
-"sv_gameplayfix_noairborncorpse_allowsuspendeditems 0\n"
-"sv_gameplayfix_easierwaterjump 0\n"
-"sv_gameplayfix_delayprojectiles 0\n"
-"sv_gameplayfix_multiplethinksperframe 0\n"
-"sv_gameplayfix_fixedcheckwatertransition 0\n"
-"sv_gameplayfix_q1bsptracelinereportstexture 0\n"
-"sv_gameplayfix_swiminbmodels 0\n"
-"sv_gameplayfix_downtracesupportsongroundflag 0\n"
-"sys_ticrate 0.01388889\n"
-"r_shadow_gloss 1\n"
-"r_shadow_bumpscale_basetexture 0\n"
-"csqc_polygons_defaultmaterial_nocullface 0\n"
+// Nehahra NPC AI is confused by blowupfallenzombies
+"sv_gameplayfix_blowupfallenzombies 0\n"
 				);
 			break;
-		// hipnotic mission pack has issues in their 'friendly monster' ai, which seem to attempt to attack themselves for some reason when findradius() returns non-solid entities.
-		// hipnotic mission pack has issues with bobbing water entities 'jittering' between different heights on alternate frames at the default 0.0138889 ticrate, 0.02 avoids this issue
-		// hipnotic mission pack has issues in their proximity mine sticking code, which causes them to bounce off.
 		case GAME_HIPNOTIC:
 		case GAME_QUOTH:
 			Cbuf_InsertText(cmd, "\n"
+// hipnotic mission pack has issues in their 'friendly monster' ai, which seem to attempt to attack themselves for some reason when findradius() returns non-solid entities.
 "sv_gameplayfix_blowupfallenzombies 0\n"
-"sv_gameplayfix_findradiusdistancetobox 0\n"
-"sv_gameplayfix_grenadebouncedownslopes 0\n"
-"sv_gameplayfix_slidemoveprojectiles 0\n"
-"sv_gameplayfix_upwardvelocityclearsongroundflag 0\n"
-"sv_gameplayfix_setmodelrealbox 0\n"
-"sv_gameplayfix_droptofloorstartsolid 0\n"
-"sv_gameplayfix_droptofloorstartsolid_nudgetocorrect 0\n"
-"sv_gameplayfix_noairborncorpse 0\n"
-"sv_gameplayfix_noairborncorpse_allowsuspendeditems 0\n"
-"sv_gameplayfix_easierwaterjump 0\n"
-"sv_gameplayfix_delayprojectiles 0\n"
-"sv_gameplayfix_multiplethinksperframe 0\n"
-"sv_gameplayfix_fixedcheckwatertransition 0\n"
-"sv_gameplayfix_q1bsptracelinereportstexture 0\n"
-"sv_gameplayfix_swiminbmodels 0\n"
-"sv_gameplayfix_downtracesupportsongroundflag 0\n"
+// hipnotic mission pack has issues with bobbing water entities 'jittering' between different heights on alternate frames at the default 0.0138889 ticrate, 0.02 avoids this issue
 "sys_ticrate 0.02\n"
-"r_shadow_gloss 1\n"
-"r_shadow_bumpscale_basetexture 0\n"
-"csqc_polygons_defaultmaterial_nocullface 0\n"
+// hipnotic mission pack has issues in their proximity mine sticking code, which causes them to bounce off.
+"sv_gameplayfix_slidemoveprojectiles 0\n"
 				);
 			break;
-		// rogue mission pack has a guardian boss that does not wake up if findradius returns one of the entities around its spawn area
 		case GAME_ROGUE:
 			Cbuf_InsertText(cmd, "\n"
+// rogue mission pack has a guardian boss that does not wake up if findradius returns one of the entities around its spawn area
 "sv_gameplayfix_blowupfallenzombies 0\n"
-"sv_gameplayfix_findradiusdistancetobox 0\n"
-"sv_gameplayfix_grenadebouncedownslopes 0\n"
-"sv_gameplayfix_slidemoveprojectiles 0\n"
-"sv_gameplayfix_upwardvelocityclearsongroundflag 0\n"
-"sv_gameplayfix_setmodelrealbox 0\n"
-"sv_gameplayfix_droptofloorstartsolid 0\n"
-"sv_gameplayfix_droptofloorstartsolid_nudgetocorrect 0\n"
-"sv_gameplayfix_noairborncorpse 0\n"
-"sv_gameplayfix_noairborncorpse_allowsuspendeditems 0\n"
-"sv_gameplayfix_easierwaterjump 0\n"
-"sv_gameplayfix_delayprojectiles 0\n"
-"sv_gameplayfix_multiplethinksperframe 0\n"
-"sv_gameplayfix_fixedcheckwatertransition 0\n"
-"sv_gameplayfix_q1bsptracelinereportstexture 0\n"
-"sv_gameplayfix_swiminbmodels 0\n"
-"sv_gameplayfix_downtracesupportsongroundflag 0\n"
-"sys_ticrate 0.01388889\n"
-"r_shadow_gloss 1\n"
-"r_shadow_bumpscale_basetexture 0\n"
-"csqc_polygons_defaultmaterial_nocullface 0\n"
+// On r2m3 3 of the 4 monster_lava_man are placed in solid clips so droptofloor() moves them to a lower level if tracebox can
+// move them out of solid, if it can't they're stuck (original behaviour), only proper fix is to move them with a .ent file.
+"mod_q1bsp_traceoutofsolid 0\n"
 				);
 			break;
 		case GAME_TENEBRAE:
 			Cbuf_InsertText(cmd, "\n"
-"sv_gameplayfix_blowupfallenzombies 0\n"
-"sv_gameplayfix_findradiusdistancetobox 0\n"
-"sv_gameplayfix_grenadebouncedownslopes 0\n"
-"sv_gameplayfix_slidemoveprojectiles 0\n"
-"sv_gameplayfix_upwardvelocityclearsongroundflag 0\n"
-"sv_gameplayfix_setmodelrealbox 0\n"
-"sv_gameplayfix_droptofloorstartsolid 0\n"
-"sv_gameplayfix_droptofloorstartsolid_nudgetocorrect 0\n"
-"sv_gameplayfix_noairborncorpse 0\n"
-"sv_gameplayfix_noairborncorpse_allowsuspendeditems 0\n"
-"sv_gameplayfix_easierwaterjump 0\n"
-"sv_gameplayfix_delayprojectiles 0\n"
-"sv_gameplayfix_multiplethinksperframe 0\n"
-"sv_gameplayfix_fixedcheckwatertransition 0\n"
-"sv_gameplayfix_q1bsptracelinereportstexture 0\n"
-"sv_gameplayfix_swiminbmodels 0\n"
-"sv_gameplayfix_downtracesupportsongroundflag 0\n"
-"sys_ticrate 0.01388889\n"
 "r_shadow_gloss 2\n"
 "r_shadow_bumpscale_basetexture 4\n"
-"csqc_polygons_defaultmaterial_nocullface 0\n"
 				);
 			break;
 		case GAME_NEXUIZ:
 			Cbuf_InsertText(cmd, "\n"
-"sv_gameplayfix_blowupfallenzombies 1\n"
-"sv_gameplayfix_findradiusdistancetobox 1\n"
-"sv_gameplayfix_grenadebouncedownslopes 1\n"
-"sv_gameplayfix_slidemoveprojectiles 1\n"
-"sv_gameplayfix_upwardvelocityclearsongroundflag 1\n"
-"sv_gameplayfix_setmodelrealbox 1\n"
-"sv_gameplayfix_droptofloorstartsolid 1\n"
-"sv_gameplayfix_droptofloorstartsolid_nudgetocorrect 1\n"
-"sv_gameplayfix_noairborncorpse 1\n"
-"sv_gameplayfix_noairborncorpse_allowsuspendeditems 1\n"
-"sv_gameplayfix_easierwaterjump 1\n"
-"sv_gameplayfix_delayprojectiles 1\n"
-"sv_gameplayfix_multiplethinksperframe 1\n"
-"sv_gameplayfix_fixedcheckwatertransition 1\n"
-"sv_gameplayfix_q1bsptracelinereportstexture 1\n"
-"sv_gameplayfix_swiminbmodels 1\n"
-"sv_gameplayfix_downtracesupportsongroundflag 1\n"
-"sys_ticrate 0.01388889\n"
 "sv_gameplayfix_q2airaccelerate 1\n"
 "sv_gameplayfix_stepmultipletimes 1\n"
 "csqc_polygons_defaultmaterial_nocullface 1\n"
@@ -769,61 +595,66 @@ static void Cmd_Exec(cmd_state_t *cmd, const char *filename)
 			break;
 		case GAME_XONOTIC:
 		case GAME_VORETOURNAMENT:
-			// compatibility for versions prior to 2020-05-25, this can be overridden in newer versions to get the default behavior and be consistent with FTEQW engine
 			Cbuf_InsertText(cmd, "\n"
+// compatibility for versions prior to 2020-05-25, this can be overridden in newer versions to get the default behavior and be consistent with FTEQW engine
 "csqc_polygons_defaultmaterial_nocullface 1\n"
 "con_chatsound_team_mask 13\n"
-"sv_gameplayfix_customstats 1\n"
+"sv_qcstats 1\n"
+"mod_q1bsp_zero_hullsize_cutoff 8.03125\n"
 				);
 			break;
-		// Steel Storm: Burning Retribution csqc misinterprets CSQC_InputEvent if type is a value other than 0 or 1
 		case GAME_STEELSTORM:
 			Cbuf_InsertText(cmd, "\n"
-"sv_gameplayfix_blowupfallenzombies 1\n"
-"sv_gameplayfix_findradiusdistancetobox 1\n"
-"sv_gameplayfix_grenadebouncedownslopes 1\n"
-"sv_gameplayfix_slidemoveprojectiles 1\n"
-"sv_gameplayfix_upwardvelocityclearsongroundflag 1\n"
-"sv_gameplayfix_setmodelrealbox 1\n"
-"sv_gameplayfix_droptofloorstartsolid 1\n"
-"sv_gameplayfix_droptofloorstartsolid_nudgetocorrect 1\n"
-"sv_gameplayfix_noairborncorpse 1\n"
-"sv_gameplayfix_noairborncorpse_allowsuspendeditems 1\n"
-"sv_gameplayfix_easierwaterjump 1\n"
-"sv_gameplayfix_delayprojectiles 1\n"
-"sv_gameplayfix_multiplethinksperframe 1\n"
-"sv_gameplayfix_fixedcheckwatertransition 1\n"
-"sv_gameplayfix_q1bsptracelinereportstexture 1\n"
-"sv_gameplayfix_swiminbmodels 1\n"
-"sv_gameplayfix_downtracesupportsongroundflag 1\n"
-"sys_ticrate 0.01388889\n"
+// Steel Storm: Burning Retribution csqc misinterprets CSQC_InputEvent if type is a value other than 0 or 1
 "cl_csqc_generatemousemoveevents 0\n"
 "csqc_polygons_defaultmaterial_nocullface 1\n"
 				);
 			break;
+		case GAME_QUAKE15:
+			Cbuf_InsertText(cmd, "\n"
+// Corpses slide around without this bug from old DP versions
+"sv_gameplayfix_impactbeforeonground 1\n"
+// Reduce likelihood of incorrectly placed corpses sinking into the ground
+"sv_gameplayfix_unstickentities 1\n"
+			);
+			break;
+		case GAME_AD:
+			Cbuf_InsertText(cmd, "\n"
+// Arcane Dimensions V1.80 Patch 1 assumes engines that don't pass values to CSQC_Init() are DP,
+// instead of doing a workaround there we can give it what it really wants (fixes offscreen HUD).
+"csqc_lowres 1\n"
+			);
+			break;
 		default:
+			break;
+		}
+
+		// special defaults for game groups go here, these execute before the specific games above
+		switch (com_startupgamegroup)
+		{
+		case GAME_NORMAL: // id1 Quake and its mods
 			Cbuf_InsertText(cmd, "\n"
-"sv_gameplayfix_blowupfallenzombies 1\n"
-"sv_gameplayfix_findradiusdistancetobox 1\n"
-"sv_gameplayfix_grenadebouncedownslopes 1\n"
-"sv_gameplayfix_slidemoveprojectiles 1\n"
-"sv_gameplayfix_upwardvelocityclearsongroundflag 1\n"
-"sv_gameplayfix_setmodelrealbox 1\n"
-"sv_gameplayfix_droptofloorstartsolid 1\n"
-"sv_gameplayfix_droptofloorstartsolid_nudgetocorrect 1\n"
-"sv_gameplayfix_noairborncorpse 1\n"
-"sv_gameplayfix_noairborncorpse_allowsuspendeditems 1\n"
-"sv_gameplayfix_easierwaterjump 1\n"
-"sv_gameplayfix_delayprojectiles 1\n"
-"sv_gameplayfix_multiplethinksperframe 1\n"
-"sv_gameplayfix_fixedcheckwatertransition 1\n"
-"sv_gameplayfix_q1bsptracelinereportstexture 1\n"
-"sv_gameplayfix_swiminbmodels 1\n"
-"sv_gameplayfix_downtracesupportsongroundflag 1\n"
-"sys_ticrate 0.01388889\n"
-"csqc_polygons_defaultmaterial_nocullface 0\n"
+"sv_gameplayfix_blowupfallenzombies 0\n"
+"sv_gameplayfix_findradiusdistancetobox 0\n"
+"sv_gameplayfix_grenadebouncedownslopes 0\n"
+"sv_gameplayfix_slidemoveprojectiles 0\n"
+"sv_gameplayfix_upwardvelocityclearsongroundflag 0\n"
+"sv_gameplayfix_setmodelrealbox 0\n"
+"sv_gameplayfix_droptofloorstartsolid 0\n"
+"sv_gameplayfix_droptofloorstartsolid_nudgetocorrect 0\n"
+"sv_gameplayfix_noairborncorpse 0\n"
+"sv_gameplayfix_noairborncorpse_allowsuspendeditems 0\n"
+"sv_gameplayfix_easierwaterjump 0\n"
+"sv_gameplayfix_delayprojectiles 0\n"
+"sv_gameplayfix_multiplethinksperframe 0\n"
+"sv_gameplayfix_fixedcheckwatertransition 0\n"
+"sv_gameplayfix_q1bsptracelinereportstexture 0\n"
+"sv_gameplayfix_swiminbmodels 0\n"
+"sv_gameplayfix_downtracesupportsongroundflag 0\n"
 				);
 			break;
+		default:
+			break;
 		}
 	}
 }
@@ -847,7 +678,7 @@ static void Cmd_Exec_f (cmd_state_t *cmd)
 	s = FS_Search(Cmd_Argv(cmd, 1), true, true, NULL);
 	if(!s || !s->numfilenames)
 	{
-		Con_Printf("couldn't exec %s\n",Cmd_Argv(cmd, 1));
+		Con_Printf(CON_WARN "couldn't exec %s\n",Cmd_Argv(cmd, 1));
 		return;
 	}
 
@@ -949,7 +780,7 @@ static void Cmd_Toggle_f(cmd_state_t *cmd)
 		}
 		else
 		{ // Invalid CVar
-			Con_Printf("ERROR : CVar '%s' not found\n", Cmd_Argv(cmd, 1) );
+			Con_Printf(CON_WARN "ERROR : CVar '%s' not found\n", Cmd_Argv(cmd, 1) );
 		}
 	}
 }
@@ -980,7 +811,7 @@ static void Cmd_Alias_f (cmd_state_t *cmd)
 	s = Cmd_Argv(cmd, 1);
 	if (strlen(s) >= MAX_ALIAS_NAME)
 	{
-		Con_Print("Alias name is too long\n");
+		Con_Print(CON_WARN "Alias name is too long\n");
 		return;
 	}
 
@@ -999,7 +830,7 @@ static void Cmd_Alias_f (cmd_state_t *cmd)
 		cmd_alias_t *prev, *current;
 
 		a = (cmd_alias_t *)Z_Malloc (sizeof(cmd_alias_t));
-		strlcpy (a->name, s, sizeof (a->name));
+		dp_strlcpy (a->name, s, sizeof (a->name));
 		// insert it at the right alphanumeric position
 		for( prev = NULL, current = cmd->userdefined->alias ; current && strcmp( current->name, a->name ) < 0 ; prev = current, current = current->next )
 			;
@@ -1018,10 +849,10 @@ static void Cmd_Alias_f (cmd_state_t *cmd)
 	for (i=2 ; i < c ; i++)
 	{
 		if (i != 2)
-			strlcat (line, " ", sizeof (line));
-		strlcat (line, Cmd_Argv(cmd, i), sizeof (line));
+			dp_strlcat (line, " ", sizeof (line));
+		dp_strlcat (line, Cmd_Argv(cmd, i), sizeof (line));
 	}
-	strlcat (line, "\n", sizeof (line));
+	dp_strlcat (line, "\n", sizeof (line));
 
 	alloclen = strlen (line) + 1;
 	if(alloclen >= 2)
@@ -1318,12 +1149,14 @@ static const char *Cmd_GetCvarValue(cmd_state_t *cmd, const char *var, size_t va
 	return varstr;
 }
 
-/*
+/**
 Cmd_PreprocessString
 
 Preprocesses strings and replaces $*, $param#, $cvar accordingly. Also strips comments.
+Returns the number of bytes written to *outtext excluding the \0 terminator.
 */
-static qbool Cmd_PreprocessString(cmd_state_t *cmd, const char *intext, char *outtext, unsigned maxoutlen, cmd_alias_t *alias ) {
+static size_t Cmd_PreprocessString(cmd_state_t *cmd, const char *intext, char *outtext, unsigned maxoutlen, cmd_alias_t *alias)
+{
 	const char *in;
 	size_t eat, varlen;
 	unsigned outlen;
@@ -1331,7 +1164,7 @@ static qbool Cmd_PreprocessString(cmd_state_t *cmd, const char *intext, char *ou
 
 	// don't crash if there's no room in the outtext buffer
 	if( maxoutlen == 0 ) {
-		return false;
+		return 0;
 	}
 	maxoutlen--; // because of \0
 
@@ -1404,7 +1237,7 @@ static qbool Cmd_PreprocessString(cmd_state_t *cmd, const char *intext, char *ou
 				{
 					val = Cmd_GetCvarValue(cmd, in + 1, varlen, alias);
 					if(!val)
-						return false;
+						return 0;
 					eat = varlen + 2;
 				}
 				else
@@ -1417,7 +1250,7 @@ static qbool Cmd_PreprocessString(cmd_state_t *cmd, const char *intext, char *ou
 				varlen = strspn(in, "#*0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-");
 				val = Cmd_GetCvarValue(cmd, in, varlen, alias);
 				if(!val)
-					return false;
+					return 0;
 				eat = varlen;
 			}
 			if(val)
@@ -1441,8 +1274,8 @@ static qbool Cmd_PreprocessString(cmd_state_t *cmd, const char *intext, char *ou
 		else 
 			outtext[outlen++] = *in++;
 	}
-	outtext[outlen] = 0;
-	return true;
+	outtext[outlen] = '\0';
+	return outlen;
 }
 
 /*
@@ -1469,6 +1302,26 @@ static void Cmd_ExecuteAlias (cmd_state_t *cmd, cmd_alias_t *alias)
 	Cbuf_InsertText(cmd, buffer2);
 }
 
+void Cmd_PreprocessAndExecuteString(cmd_state_t *cmd, const char *text, size_t textlen, cmd_source_t src, qbool lockmutex)
+{
+	char preprocessed[MAX_INPUTLINE];
+	size_t preprocessed_len;
+	const char *firstchar;
+
+	firstchar = text;
+	while(*firstchar && ISWHITESPACE(*firstchar))
+		++firstchar;
+	if((strncmp(firstchar, "alias", 5)   || !ISWHITESPACE(firstchar[5]))
+	&& (strncmp(firstchar, "bind", 4)    || !ISWHITESPACE(firstchar[4]))
+	&& (strncmp(firstchar, "in_bind", 7) || !ISWHITESPACE(firstchar[7])))
+	{
+		if((preprocessed_len = Cmd_PreprocessString(cmd, text, preprocessed, sizeof(preprocessed), NULL)))
+			Cmd_ExecuteString(cmd, preprocessed, preprocessed_len, src, lockmutex);
+	}
+	else
+		Cmd_ExecuteString(cmd, text, textlen, src, lockmutex);
+}
+
 /*
 ========
 Cmd_List
@@ -1500,7 +1353,7 @@ static void Cmd_List_f (cmd_state_t *cmd)
 	}
 
 	count = 0;
-	for (func = cmd->userdefined->csqc_functions; func; func = func->next)
+	for (func = cmd->userdefined->qc_functions; func; func = func->next)
 	{
 		if (partial && (ispattern ? !matchpattern_with_separator(func->name, partial, false, "", false) : strncmp(partial, func->name, len)))
 			continue;
@@ -1558,17 +1411,17 @@ static void Cmd_Apropos_f(cmd_state_t *cmd)
 			Cvar_PrintHelp(cvar, cvar->name, true);
 			count++;
 		}
-		for (int i = 0; i < cvar->aliasindex; i++)
+		for (char **cvar_alias = cvar->aliases; cvar_alias && *cvar_alias; cvar_alias++)
 		{
-			if (matchpattern_with_separator(cvar->aliases[i], partial, true, "", false))
+			if (matchpattern_with_separator(*cvar_alias, partial, true, "", false))
 			{
 				Con_Printf ("cvar ");
-				Cvar_PrintHelp(cvar, cvar->aliases[i], true);
+				Cvar_PrintHelp(cvar, *cvar_alias, true);
 				count++;
 			}
 		}
 	}
-	for (func = cmd->userdefined->csqc_functions; func; func = func->next)
+	for (func = cmd->userdefined->qc_functions; func; func = func->next)
 	{
 		if (!matchpattern_with_separator(func->name, partial, true, "", false))
 			if (!matchpattern_with_separator(func->description, partial, true, "", false))
@@ -1596,6 +1449,23 @@ static void Cmd_Apropos_f(cmd_state_t *cmd)
 	Con_Printf("%i result%s\n\n", count, (count > 1) ? "s" : "");
 }
 
+static cmd_state_t *Cmd_AddInterpreter(cmd_buf_t *cbuf, cvar_state_t *cvars, unsigned cvars_flagsmask, unsigned cmds_flagsmask, cmd_userdefined_t *userdefined)
+{
+	cmd_state_t *cmd = (cmd_state_t *)Mem_Alloc(tempmempool, sizeof(cmd_state_t));
+	
+	cmd->mempool = Mem_AllocPool("commands", 0, NULL);
+	// space for commands and script files
+	cmd->cbuf = cbuf;
+	cmd->null_string = "";
+
+	cmd->cvars = cvars;
+	cmd->cvars_flagsmask = cvars_flagsmask;
+	cmd->cmd_flagsmask = cmds_flagsmask;
+	cmd->userdefined = userdefined;
+
+	return cmd;
+}
+
 /*
 ============
 Cmd_Init
@@ -1603,9 +1473,12 @@ Cmd_Init
 */
 void Cmd_Init(void)
 {
-	cmd_iter_t *cmd_iter;
-	cmd_buf_t *cbuf = (cmd_buf_t *)Z_Malloc(sizeof(cmd_buf_t));
-	cbuf->maxsize = 655360;
+	cmd_buf_t *cbuf;
+	unsigned cvars_flagsmask, cmds_flagsmask;
+
+	cbuf_mempool = Mem_AllocPool("Command buffer", 0, NULL);
+	cbuf = (cmd_buf_t *)Mem_Alloc(cbuf_mempool, sizeof(cmd_buf_t));
+	cbuf->maxsize = CMDBUFSIZE;
 	cbuf->lock = Thread_CreateMutex();
 	cbuf->wait = false;
 	host.cbuf = cbuf;
@@ -1614,42 +1487,33 @@ void Cmd_Init(void)
 	cbuf->deferred.prev = cbuf->deferred.next = &(cbuf->deferred);
 	cbuf->free.prev = cbuf->free.next = &(cbuf->free);
 
-	for (cmd_iter = cmd_iter_all; cmd_iter->cmd; cmd_iter++)
+	// FIXME: Get rid of cmd_iter_all eventually. This is just a hack to reduce the amount of work to make the interpreters dynamic.
+	cmd_iter_all = (cmd_iter_t *)Mem_Alloc(tempmempool, sizeof(cmd_iter_t) * 3);
+
+	// local console
+	if (cls.state == ca_dedicated)
 	{
-		cmd_state_t *cmd = cmd_iter->cmd;
-		cmd->mempool = Mem_AllocPool("commands", 0, NULL);
-		// space for commands and script files
-		cmd->cbuf = cbuf;
-		cmd->null_string = "";
-	}
-	// client console can see server cvars because the user may start a server
-	cmd_client.cvars = &cvars_all;
-	cmd_client.cvars_flagsmask = CF_CLIENT | CF_SERVER;
-	cmd_client.cmd_flags = CF_CLIENT | CF_CLIENT_FROM_SERVER;
-	cmd_client.auto_flags = CF_SERVER_FROM_CLIENT;
-	cmd_client.auto_function = CL_ForwardToServer_f; // FIXME: Move this to the client.
-	cmd_client.userdefined = &cmd_userdefined_all;
-	// dedicated server console can only see server cvars, there is no client
-	cmd_server.cvars = &cvars_all;
-	cmd_server.cvars_flagsmask = CF_SERVER;
-	cmd_server.cmd_flags = CF_SERVER;
-	cmd_server.auto_flags = 0;
-	cmd_server.auto_function = NULL;
-	cmd_server.userdefined = &cmd_userdefined_all;
+		cvars_flagsmask = CF_SERVER;
+		cmds_flagsmask = CF_SERVER | CF_SERVER_FROM_CLIENT;
+	}
+	else
+	{
+		cvars_flagsmask = CF_CLIENT | CF_SERVER;
+		cmds_flagsmask = CF_CLIENT | CF_SERVER | CF_CLIENT_FROM_SERVER | CF_SERVER_FROM_CLIENT;
+	}
+	cmd_iter_all[0].cmd = cmd_local = Cmd_AddInterpreter(cbuf, &cvars_all, cvars_flagsmask, cmds_flagsmask, &cmd_userdefined_all);
+	cmd_local->Handle = Cmd_CL_Callback;
+
 	// server commands received from clients have no reason to access cvars, cvar expansion seems perilous.
-	cmd_serverfromclient.cvars = &cvars_null;
-	cmd_serverfromclient.cvars_flagsmask = 0;
-	cmd_serverfromclient.cmd_flags = CF_SERVER_FROM_CLIENT | CF_USERINFO;
-	cmd_serverfromclient.auto_flags = 0;
-	cmd_serverfromclient.auto_function = NULL;
-	cmd_serverfromclient.userdefined = &cmd_userdefined_null;
+	cmd_iter_all[1].cmd = cmd_serverfromclient = Cmd_AddInterpreter(cbuf, &cvars_null, 0, CF_SERVER_FROM_CLIENT | CF_USERINFO, &cmd_userdefined_null);
+	cmd_serverfromclient->Handle = Cmd_SV_Callback;
 
+	cmd_iter_all[2].cmd = NULL;
 //
 // register our commands
 //
 	// client-only commands
 	Cmd_AddCommand(CF_SHARED, "wait", Cmd_Wait_f, "make script execution wait for next rendered frame");
-	Cmd_AddCommand(CF_CLIENT, "cprint", Cmd_Centerprint_f, "print something at the screen center");
 
 	// maintenance commands used for upkeep of cvars and saved configs
 	Cmd_AddCommand(CF_SHARED, "stuffcmds", Cmd_StuffCmds_f, "execute commandline parameters (must be present in quake.rc script)");
@@ -1707,52 +1571,22 @@ void Cmd_Shutdown(void)
 	}
 }
 
-/*
-============
-Cmd_Argc
-============
-*/
-int		Cmd_Argc (cmd_state_t *cmd)
-{
-	return cmd->argc;
-}
-
-/*
-============
-Cmd_Argv
-============
-*/
-const char *Cmd_Argv(cmd_state_t *cmd, int arg)
-{
-	if (arg >= cmd->argc )
-		return cmd->null_string;
-	return cmd->argv[arg];
-}
-
-/*
-============
-Cmd_Args
-============
-*/
-const char *Cmd_Args (cmd_state_t *cmd)
-{
-	return cmd->args;
-}
-
 /*
 ============
 Cmd_TokenizeString
 
 Parses the given string into command line tokens.
+Takes a null terminated string.  Does not need to be /n terminated.
 ============
 */
-// AK: This function should only be called from ExcuteString because the current design is a bit of an hack
+// AK: This function should only be called from ExecuteString because the current design is a bit of an hack
 static void Cmd_TokenizeString (cmd_state_t *cmd, const char *text)
 {
 	int l;
 
 	cmd->argc = 0;
 	cmd->args = NULL;
+	cmd->cmdline = NULL;
 
 	while (1)
 	{
@@ -1776,6 +1610,8 @@ static void Cmd_TokenizeString (cmd_state_t *cmd, const char *text)
 		if (!*text)
 			return;
 
+		if(!cmd->argc)
+			cmd->cmdline = text;
 		if (cmd->argc == 1)
 			cmd->args = text;
 
@@ -1787,7 +1623,7 @@ static void Cmd_TokenizeString (cmd_state_t *cmd, const char *text)
 			l = (int)strlen(com_token) + 1;
 			if (cmd->cbuf->tokenizebufferpos + l > CMD_TOKENIZELENGTH)
 			{
-				Con_Printf("Cmd_TokenizeString: ran out of %i character buffer space for command arguments\n", CMD_TOKENIZELENGTH);
+				Con_Printf(CON_WARN "Cmd_TokenizeString: ran out of %i character buffer space for command arguments\n", CMD_TOKENIZELENGTH);
 				break;
 			}
 			memcpy (cmd->cbuf->tokenizebuffer + cmd->cbuf->tokenizebufferpos, com_token, l);
@@ -1804,31 +1640,22 @@ static void Cmd_TokenizeString (cmd_state_t *cmd, const char *text)
 Cmd_AddCommand
 ============
 */
-void Cmd_AddCommand(int flags, const char *cmd_name, xcommand_t function, const char *description)
+void Cmd_AddCommand(unsigned flags, const char *cmd_name, xcommand_t function, const char *description)
 {
 	cmd_function_t *func;
 	cmd_function_t *prev, *current;
 	cmd_state_t *cmd;
-	xcommand_t save = NULL;
-	qbool auto_add = false;
 	int i;
 
-	for (i = 0; i < 3; i++)
+	for (i = 0; i < 2; i++)
 	{
 		cmd = cmd_iter_all[i].cmd;
-		if ((flags & cmd->cmd_flags) || (flags & cmd->auto_flags))
+		if (flags & cmd->cmd_flagsmask)
 		{
-			if((flags & cmd->auto_flags) && cmd->auto_function)
-			{
-				save = function;
-				function = cmd->auto_function;
-				auto_add = true;
-			}
-
 			// fail if the command is a variable name
 			if (Cvar_FindVar(cmd->cvars, cmd_name, ~0))
 			{
-				Con_Printf("Cmd_AddCommand: %s already defined as a var\n", cmd_name);
+				Con_Printf(CON_WARN "Cmd_AddCommand: %s already defined as a var\n", cmd_name);
 				return;
 			}
 
@@ -1839,10 +1666,8 @@ void Cmd_AddCommand(int flags, const char *cmd_name, xcommand_t function, const
 				{
 					if (!strcmp(cmd_name, func->name))
 					{
-						if(func->autofunc && !auto_add)
-							break;
-						Con_Printf("Cmd_AddCommand: %s already defined\n", cmd_name);
-						goto next;
+						Con_Printf(CON_WARN "Cmd_AddCommand: %s already defined\n", cmd_name);
+						continue;
 					}
 				}
 
@@ -1852,7 +1677,6 @@ void Cmd_AddCommand(int flags, const char *cmd_name, xcommand_t function, const
 				func->function = function;
 				func->description = description;
 				func->next = cmd->engine_functions;
-				func->autofunc = auto_add;
 
 				// insert it at the right alphanumeric position
 				for (prev = NULL, current = cmd->engine_functions; current && strcmp(current->name, func->name) < 0; prev = current, current = current->next)
@@ -1867,42 +1691,48 @@ void Cmd_AddCommand(int flags, const char *cmd_name, xcommand_t function, const
 			}
 			else
 			{
-				// mark csqcfunc if the function already exists in the csqc_functions list
-				for (func = cmd->userdefined->csqc_functions; func; func = func->next)
+				// mark qcfunc if the function already exists in the qc_functions list
+				for (func = cmd->userdefined->qc_functions; func; func = func->next)
 				{
 					if (!strcmp(cmd_name, func->name))
 					{
-						func->csqcfunc = true; //[515]: csqc
+						func->qcfunc = true; //[515]: csqc
 						continue;
 					}
 				}
 
-
 				func = (cmd_function_t *)Mem_Alloc(cmd->mempool, sizeof(cmd_function_t));
+				func->flags = flags;
 				func->name = cmd_name;
 				func->function = function;
 				func->description = description;
-				func->csqcfunc = true; //[515]: csqc
-				func->next = cmd->userdefined->csqc_functions;
-				func->autofunc = false;
+				func->qcfunc = true; //[515]: csqc
+				func->next = cmd->userdefined->qc_functions;
+
+				// bones_was_here: if this QC command overrides an engine command, store its pointer
+				// to avoid doing this search at invocation if QC declines to handle this command.
+				for (cmd_function_t *f = cmd->engine_functions; f; f = f->next)
+				{
+					if (!strcmp(cmd_name, f->name))
+					{
+						Con_DPrintf("Adding QC override of engine command %s\n", cmd_name);
+						func->overridden = f;
+						break;
+					}
+				}
 
 				// insert it at the right alphanumeric position
-				for (prev = NULL, current = cmd->userdefined->csqc_functions; current && strcmp(current->name, func->name) < 0; prev = current, current = current->next)
+				for (prev = NULL, current = cmd->userdefined->qc_functions; current && strcmp(current->name, func->name) < 0; prev = current, current = current->next)
 					;
 				if (prev) {
 					prev->next = func;
 				}
 				else {
-					cmd->userdefined->csqc_functions = func;
+					cmd->userdefined->qc_functions = func;
 				}
 				func->next = current;
 			}
-			if (save)
-				function = save;
 		}
-next:
-		auto_add = false;
-		continue;
 	}
 }
 
@@ -1915,7 +1745,7 @@ qbool Cmd_Exists (cmd_state_t *cmd, const char *cmd_name)
 {
 	cmd_function_t	*func;
 
-	for (func = cmd->userdefined->csqc_functions; func; func = func->next)
+	for (func = cmd->userdefined->qc_functions; func; func = func->next)
 		if (!strcmp(cmd_name, func->name))
 			return true;
 
@@ -1943,7 +1773,7 @@ const char *Cmd_CompleteCommand (cmd_state_t *cmd, const char *partial)
 		return NULL;
 
 // check functions
-	for (func = cmd->userdefined->csqc_functions; func; func = func->next)
+	for (func = cmd->userdefined->qc_functions; func; func = func->next)
 		if (!strncasecmp(partial, func->name, len))
 			return func->name;
 
@@ -1976,7 +1806,7 @@ int Cmd_CompleteCountPossible (cmd_state_t *cmd, const char *partial)
 		return 0;
 
 	// Loop through the command list and count all partial matches
-	for (func = cmd->userdefined->csqc_functions; func; func = func->next)
+	for (func = cmd->userdefined->qc_functions; func; func = func->next)
 		if (!strncasecmp(partial, func->name, len))
 			h++;
 
@@ -2007,7 +1837,7 @@ const char **Cmd_CompleteBuildList (cmd_state_t *cmd, const char *partial)
 	len = strlen(partial);
 	buf = (const char **)Mem_Alloc(tempmempool, sizeofbuf + sizeof (const char *));
 	// Loop through the functions lists and print all matches
-	for (func = cmd->userdefined->csqc_functions; func; func = func->next)
+	for (func = cmd->userdefined->qc_functions; func; func = func->next)
 		if (!strncasecmp(partial, func->name, len))
 			buf[bpos++] = func->name;
 	for (func = cmd->engine_functions; func; func = func->next)
@@ -2024,7 +1854,7 @@ void Cmd_CompleteCommandPrint (cmd_state_t *cmd, const char *partial)
 	cmd_function_t *func;
 	size_t len = strlen(partial);
 	// Loop through the command list and print all matches
-	for (func = cmd->userdefined->csqc_functions; func; func = func->next)
+	for (func = cmd->userdefined->qc_functions; func; func = func->next)
 		if (!strncasecmp(partial, func->name, len))
 			Con_Printf("^2%s^7: %s\n", func->name, func->description);
 	for (func = cmd->engine_functions; func; func = func->next)
@@ -2133,7 +1963,7 @@ const char **Cmd_CompleteAliasBuildList (cmd_state_t *cmd, const char *partial)
 void Cmd_ClearCSQCCommands (cmd_state_t *cmd)
 {
 	cmd_function_t *func;
-	cmd_function_t **next = &cmd->userdefined->csqc_functions;
+	cmd_function_t **next = &cmd->userdefined->qc_functions;
 	
 	while(*next)
 	{
@@ -2145,6 +1975,70 @@ void Cmd_ClearCSQCCommands (cmd_state_t *cmd)
 
 extern cvar_t sv_cheats;
 
+/*
+ * Cloudwalk FIXME: This idea sounded great in my head but...
+ * How do we handle commands that can be received by the client,
+ * but which the server can also execute locally?
+ * 
+ * If we create a callback where the engine will forward to server
+ * but try to execute the command locally if it's dedicated,
+ * we're back to intermixing client and server code which I'm
+ * trying to avoid. There's no other way I can think of to
+ * implement that behavior that doesn't involve an #ifdef, or
+ * making a mess of hooks.
+ */
+qbool Cmd_Callback(cmd_state_t *cmd, cmd_function_t *func)
+{
+	if (func->function)
+		func->function(cmd);
+	else
+		Con_Printf(CON_WARN "Command \"%s\" can not be executed\n", Cmd_Argv(cmd, 0));
+	return true;
+}
+
+qbool Cmd_CL_Callback(cmd_state_t *cmd, cmd_function_t *func, const char *text, size_t textlen, cmd_source_t src)
+{
+	// TODO: Assign these functions to QC commands directly?
+	if(func->qcfunc)
+	{
+		if(((func->flags & CF_CLIENT) && CL_VM_ConsoleCommand(text, textlen)) ||
+		   ((func->flags & CF_SERVER) && SV_VM_ConsoleCommand(text, textlen)))
+			return true;
+
+		if (func->overridden) // If this QC command overrides an engine command,
+			func = func->overridden; // fall back to that command.
+	}
+	if (func->flags & CF_SERVER_FROM_CLIENT)
+	{
+		if(host_isclient.integer)
+		{
+			CL_ForwardToServer_f(cmd);
+			return true;
+		}
+		else if(!(func->flags & CF_SERVER))
+		{
+			Con_Printf(CON_WARN "Cannot execute client commands from a dedicated server console.\n");
+			return true;
+		}
+	}
+	return Cmd_Callback(cmd, func);
+}
+
+qbool Cmd_SV_Callback(cmd_state_t *cmd, cmd_function_t *func, const char *text, size_t textlen, cmd_source_t src)
+{
+	if(func->qcfunc && (func->flags & CF_SERVER))
+		return SV_VM_ConsoleCommand(text, textlen);
+	else if (src == src_client)
+	{
+		if((func->flags & CF_CHEAT) && !sv_cheats.integer)
+			SV_ClientPrintf(CON_WARN "No cheats allowed. The server must have sv_cheats set to 1\n");
+		else
+			func->function(cmd);
+		return true;
+	}
+	return false;
+}
+
 /*
 ============
 Cmd_ExecuteString
@@ -2153,11 +2047,12 @@ A complete command line has been parsed, so try to execute it
 FIXME: lookupnoadd the token to speed search?
 ============
 */
-void Cmd_ExecuteString (cmd_state_t *cmd, const char *text, cmd_source_t src, qbool lockmutex)
+void Cmd_ExecuteString(cmd_state_t *cmd, const char *text, size_t textlen, cmd_source_t src, qbool lockmutex)
 {
 	int oldpos;
 	cmd_function_t *func;
 	cmd_alias_t *a;
+
 	if (lockmutex)
 		Cbuf_Lock(cmd->cbuf);
 	oldpos = cmd->cbuf->tokenizebufferpos;
@@ -2170,50 +2065,28 @@ void Cmd_ExecuteString (cmd_state_t *cmd, const char *text, cmd_source_t src, qb
 		goto done; // no tokens
 
 // check functions
-	for (func = cmd->userdefined->csqc_functions; func; func = func->next)
-	{
+	for (func = cmd->userdefined->qc_functions; func; func = func->next)
 		if (!strcasecmp(cmd->argv[0], func->name))
-		{
-			if (func->csqcfunc && CL_VM_ConsoleCommand(text))	//[515]: csqc
-				goto done;
-			break;
-		}
-	}
+			if(cmd->Handle(cmd, func, text, textlen, src))
+				goto functions_done;
 
 	for (func = cmd->engine_functions; func; func=func->next)
-	{
 		if (!strcasecmp (cmd->argv[0], func->name))
-		{
-			switch (src)
-			{
-			case src_local:
-				if (func->function)
-					func->function(cmd);
-				else
-					Con_Printf("Command \"%s\" can not be executed\n", Cmd_Argv(cmd, 0));
-				goto done;
-			case src_client:
-				if (func->function)
-				{
-					if((func->flags & CF_CHEAT) && !sv_cheats.integer)
-						SV_ClientPrintf("No cheats allowed. The server must have sv_cheats set to 1\n");
-					else
-						func->function(cmd);
-					goto done;
-				}
-			}
-			break;
-		}
-	}
+			if(cmd->Handle(cmd, func, text, textlen, src))
+				goto functions_done;
 
-	// if it's a client command and no command was found, say so.
+functions_done:
+	// If it's a client command and wasn't found and handled, say so.
+	// Also don't let clients call server aliases.
 	if (cmd->source == src_client)
 	{
-		Con_Printf("Client \"%s\" tried to execute \"%s\"\n", host_client->name, text);
+		if (!func)
+			Con_Printf("Client \"%s\" tried to execute \"%s\"\n", host_client->name, text);
 		goto done;
 	}
 
 // check alias
+	// Execute any alias with the same name as a command after the command.
 	for (a=cmd->userdefined->alias ; a ; a=a->next)
 	{
 		if (!strcasecmp (cmd->argv[0], a->name))
@@ -2223,9 +2096,14 @@ void Cmd_ExecuteString (cmd_state_t *cmd, const char *text, cmd_source_t src, qb
 		}
 	}
 
+	// If the command was found and handled don't try to handle it as a cvar.
+	if (func)
+		goto done;
+
 // check cvars
-	if (!Cvar_Command(cmd) && host.framecount > 0)
-		Con_Printf("Unknown command \"%s\"\n", Cmd_Argv(cmd, 0));
+	// Xonotic is still maintained so we don't want to hide problems from getting fixed
+	if (!Cvar_Command(cmd) && (host.framecount > 0 || gamemode == GAME_XONOTIC))
+		Con_Printf(CON_WARN "Unknown command \"%s\"\n", Cmd_Argv(cmd, 0));
 done:
 	cmd->cbuf->tokenizebufferpos = oldpos;
 	if (lockmutex)
@@ -2247,7 +2125,7 @@ int Cmd_CheckParm (cmd_state_t *cmd, const char *parm)
 
 	if (!parm)
 	{
-		Con_Printf ("Cmd_CheckParm: NULL");
+		Con_Printf(CON_WARN "Cmd_CheckParm: NULL");
 		return 0;
 	}
 
@@ -2268,7 +2146,7 @@ void Cmd_SaveInitState(void)
 		cmd_state_t *cmd = cmd_iter->cmd;
 		cmd_function_t *f;
 		cmd_alias_t *a;
-		for (f = cmd->userdefined->csqc_functions; f; f = f->next)
+		for (f = cmd->userdefined->qc_functions; f; f = f->next)
 			f->initstate = true;
 		for (f = cmd->engine_functions; f; f = f->next)
 			f->initstate = true;
@@ -2289,7 +2167,7 @@ void Cmd_RestoreInitState(void)
 		cmd_state_t *cmd = cmd_iter->cmd;
 		cmd_function_t *f, **fp;
 		cmd_alias_t *a, **ap;
-		for (fp = &cmd->userdefined->csqc_functions; (f = *fp);)
+		for (fp = &cmd->userdefined->qc_functions; (f = *fp);)
 		{
 			if (f->initstate)
 				fp = &f->next;
@@ -2340,3 +2218,7 @@ void Cmd_RestoreInitState(void)
 	}
 	Cvar_RestoreInitState(&cvars_all);
 }
+
+void Cmd_NoOperation_f(cmd_state_t *cmd)
+{
+}