Win32: ioctl SIO_UDP_CONNRESET <- FALSE

[xonotic/darkplaces.git] / cmd.c

diff --git a/cmd.c b/cmd.c
index 82a98ae5e56dc947e22bffcc9760781804536266..00aa78ba00bda6298494e3cfc82bf98c3da610de 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -159,6 +159,8 @@ void Cbuf_Execute (void)
                {
                        if (text[i] == '"')
                                quotes ^= 1;
+                       if (text[i] == '\\' && text[i+1] == '"')
+                               i++;
                        if ( !quotes &&  text[i] == ';')
                                break;  // don't break if inside a quoted string
                        if (text[i] == '\r' || text[i] == '\n')
@@ -566,7 +568,7 @@ static void Cmd_PreprocessString( const char *intext, char *outtext, unsigned ma
                                cvar_t *cvar;
                                const char *tempin = in;
 
-                               COM_ParseTokenConsole( &tempin );
+                               COM_ParseToken_Console( &tempin );
                                // don't expand rcon_password or similar cvars (CVAR_PRIVATE flag)
                                if ((cvar = Cvar_FindVar(&com_token[0])) && !(cvar->flags & CVAR_PRIVATE)) {
                                        const char *cvarcontent = cvar->string;
@@ -776,7 +778,7 @@ static void Cmd_TokenizeString (const char *text)
                if (cmd_argc == 1)
                        cmd_args = text;
 
-               if (!COM_ParseTokenConsole(&text))
+               if (!COM_ParseToken_Console(&text))
                        return;
 
                if (cmd_argc < MAX_ARGS)