X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cmd.c;h=2af8f84c6ef50f6c6648dd3bf94367686eee5157;hb=8be3332ab72df182015954522011995f61c89a02;hp=a9a685f4ac3fad7caac8e75b5527c56a3779cc7f;hpb=fedd11040f771c4b9585a38df92935bad1634f09;p=xonotic%2Fdarkplaces.git

diff --git a/cmd.c b/cmd.c
index a9a685f4..2af8f84c 100644
--- a/cmd.c
+++ b/cmd.c
@@ -502,7 +502,9 @@ static void Cmd_ExecuteAlias (cmdalias_t *alias)
 {
 	static char buffer[ MAX_INPUTLINE + 2 ];
 	Cmd_PreprocessString( alias->value, buffer, sizeof(buffer) - 2, alias );
-	Cbuf_AddText( buffer );
+	// insert at start of command buffer, so that aliases execute in order
+	// (fixes bug introduced by Black on 20050705)
+	Cbuf_InsertText( buffer );
 }
 
 /*
@@ -1028,14 +1030,14 @@ void Cmd_ForwardStringToServer (const char *s)
 		return;
 	}
 
-	if (cls.demoplayback)
-		return;		// not really connected
+	if (!cls.netcon)
+		return;
 
 	// LordHavoc: thanks to Fuh for bringing the pure evil of SZ_Print to my
 	// attention, it has been eradicated from here, its only (former) use in
 	// all of darkplaces.
-	MSG_WriteByte(&cls.message, clc_stringcmd);
-	SZ_Write(&cls.message, (const unsigned char *)s, (int)strlen(s) + 1);
+	MSG_WriteByte(&cls.netcon->message, clc_stringcmd);
+	SZ_Write(&cls.netcon->message, (const unsigned char *)s, (int)strlen(s) + 1);
 }
 
 /*