added developer_entityparsing cvar to aid in debugging entitystring parsing issues...

[xonotic/darkplaces.git] / prvm_edict.c

diff --git a/prvm_edict.c b/prvm_edict.c
index f51ffcfc7592a5de7fbfb36db86633ff94172105..1dec266c4363d3fba4b52455a9f21e0a3a45fb3c 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -832,7 +832,7 @@ void PRVM_ED_ParseGlobals (const char *data)
        {
                // parse key
                if (!COM_ParseToken(&data, false))
-                       PRVM_ERROR ("PRVM_ED_ParseEntity: EOF without closing brace");
+                       PRVM_ERROR ("PRVM_ED_ParseGlobals: EOF without closing brace");
                if (com_token[0] == '}')
                        break;
 
@@ -840,10 +840,10 @@ void PRVM_ED_ParseGlobals (const char *data)
 
                // parse value
                if (!COM_ParseToken(&data, false))
-                       PRVM_ERROR ("PRVM_ED_ParseEntity: EOF without closing brace");
+                       PRVM_ERROR ("PRVM_ED_ParseGlobals: EOF without closing brace");
 
                if (com_token[0] == '}')
-                       PRVM_ERROR ("PRVM_ED_ParseEntity: closing brace without data");
+                       PRVM_ERROR ("PRVM_ED_ParseGlobals: closing brace without data");
 
                key = PRVM_ED_FindGlobal (keyname);
                if (!key)
@@ -1009,6 +1009,7 @@ ed should be a properly initialized empty edict.
 Used for initial level load and for savegames.
 ====================
 */
+extern cvar_t developer_entityparsing;
 const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent)
 {
        ddef_t *key;
@@ -1024,7 +1025,9 @@ const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent)
        {
        // parse key
                if (!COM_ParseToken(&data, false))
-                       PRVM_ERROR ("PRVM_ED_ParseEntity: EOF without closing brace");
+                       PRVM_ERROR ("PRVM_ED_ParseEdict: EOF without closing brace");
+               if (developer_entityparsing.integer)
+                       Con_Printf("Key: \"%s\"", com_token);
                if (com_token[0] == '}')
                        break;
 
@@ -1054,10 +1057,12 @@ const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent)
 
        // parse value
                if (!COM_ParseToken(&data, false))
-                       PRVM_ERROR ("PRVM_ED_ParseEntity: EOF without closing brace");
+                       PRVM_ERROR ("PRVM_ED_ParseEdict: EOF without closing brace");
+               if (developer_entityparsing.integer)
+                       Con_Printf(" \"%s\"\n", com_token);
 
                if (com_token[0] == '}')
-                       PRVM_ERROR ("PRVM_ED_ParseEntity: closing brace without data");
+                       PRVM_ERROR ("PRVM_ED_ParseEdict: closing brace without data");
 
                init = true;