Removed inline from function Con_Rcon_AddChar due to MSVC8 (Visual Studio 2005) not...

[xonotic/darkplaces.git] / common.c

diff --git a/common.c b/common.c
index cfeda8912e415047ba861a3e5a4b05446c8491e2..8f532520a66d3685d238738d1d2678b7762413d0 100644 (file)
--- a/common.c
+++ b/common.c
@@ -1007,7 +1007,7 @@ skipwhite:
                *datapointer = data;
                return true;
        }
-       else if (*data == '\n' || *data == ',' || *data == ';')
+       else if (*data == '\n' || *data == '{' || *data == '}' || *data == ')' || *data == '(' || *data == ']' || *data == '[' || *data == ':' || *data == ',' || *data == ';')
        {
                // single character
                com_token[len++] = *data++;
@@ -1018,7 +1018,7 @@ skipwhite:
        else
        {
                // regular word
-               for (;*data > ' ' && *data != ',' && *data != ';';data++)
+               for (;*data > ' ' && *data != ',' && *data != ';' && *data != '{' && *data != '}' && *data != ')' && *data != '(' && *data != ']' && *data != '[' && *data != ':' && *data != ',' && *data != ';';data++)
                {
                        if (len >= (int)sizeof(com_token) - 1)
                        {
@@ -1085,8 +1085,8 @@ skipwhite:
                                *datapointer = NULL;
                                return false;
                        }
-                       // allow escaped " case
-                       if (*data == '\\' && data[1] == '\"')
+                       // allow escaped " and \ case
+                       if (*data == '\\' && (data[1] == '\"' || data[1] == '\\'))
                                data++;
                        com_token[len++] = *data;
                }