increased sv_maxrate limit to 150000 from 25000

[xonotic/darkplaces.git] / cmd.c

diff --git a/cmd.c b/cmd.c
index a9a685f4ac3fad7caac8e75b5527c56a3779cc7f..b042cd28b3de7cccffaacb127bb2ad099d1f7db3 100644 (file)
--- 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,17 @@ 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);
+       if (cls.protocol == PROTOCOL_QUAKEWORLD)
+               MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd);
+       else
+               MSG_WriteByte(&cls.netcon->message, clc_stringcmd);
+       SZ_Write(&cls.netcon->message, (const unsigned char *)s, (int)strlen(s) + 1);
 }
 
 /*