-Minor fix in VM_registercvar.

-Added \" support to quoted strings in Com_ParseToken.
-Minor change to PRVM_PrintStatus.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4722 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/common.c b/common.c
index 23658af4ae60551230b2e0e23ae18fc0e70eaa90..6f8065a6a48b577ea5b6a1ec023e10d72a899724 100644 (file)
--- a/common.c
+++ b/common.c
@@ -669,6 +669,8 @@ skipwhite:
                // quoted string
                for (data++;*data != '\"';data++)
                {
+                       if (*data == '\\' && data[1] == '"' )
+                               data++;
                        if (!*data || len >= (int)sizeof(com_token) - 1)
                        {
                                com_token[0] = 0;

diff --git a/menu.c b/menu.c
index c2e7dc14811a3d48a6a852a1ef52af038a9476b7..162d4d20545d94f14a1e616f684b284cf6923339 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -4188,7 +4188,7 @@ mfunction_t *PRVM_ED_FindFunction(const char *);
 // normal menu names (rest)
 #define M_F_TOGGLE             "m_toggle"
 #define M_F_SHUTDOWN   "m_shutdown"
-#undef NG_MENU
+
 static char *m_required_func[] = {
 M_F_INIT,
 M_F_KEYDOWN,

diff --git a/prvm_cmds.c b/prvm_cmds.c
index 67f687336d2d82dcbd6bed5af3efe4238dccad87..dbfd5723548c62c1cf436de4afe1d9b4a1e45c17 100644 (file)
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -1543,7 +1543,7 @@ void VM_registercvar (void)
                return;
        }
 
-       Cvar_Get(name, value, 0);
+       Cvar_Get(name, value, flags);
 
        PRVM_G_FLOAT(OFS_RETURN) = 1; // success
 }

diff --git a/prvm_exec.c b/prvm_exec.c
index 09bebf29099f0b3947f4d59704e88a77666430bb..fe79817aa752a5efafb39182c4b9adf8532e69ed 100644 (file)
--- a/prvm_exec.c
+++ b/prvm_exec.c
@@ -252,7 +252,7 @@ void PRVM_PrintState(void)
        int i;
        if (prog->xfunction)
        {
-               for (i = -4;i <= 0;i++)
+               for (i = -7; i <= 0;i++)
                        if (prog->xstatement + i >= prog->xfunction->first_statement)
                                PRVM_PrintStatement (prog->statements + prog->xstatement + i);
        }