- add debug prints for saving/loading games for prvm_entityparsing

[xonotic/darkplaces.git] / prvm_edict.c

diff --git a/prvm_edict.c b/prvm_edict.c
index 1ccfc36ab08d0bf3a96326dc761432706e2d74c4..742e4b988b9ee3ae77aecb1f9b183fb408a1e287 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -507,6 +507,11 @@ char *PRVM_UglyValueString (etype_t type, prvm_eval_t *val)
                                line[i++] = '\\';
                                line[i++] = '\\';
                        }
+                       else if (*s == '"')
+                       {
+                               line[i++] = '\\';
+                               line[i++] = '"';
+                       }
                        else
                                line[i++] = *s;
                        s++;
@@ -686,6 +691,7 @@ PRVM_ED_Write
 For savegames
 =============
 */
+extern cvar_t developer_entityparsing;
 void PRVM_ED_Write (qfile_t *f, prvm_edict_t *ed)
 {
        ddef_t  *d;
@@ -706,6 +712,10 @@ void PRVM_ED_Write (qfile_t *f, prvm_edict_t *ed)
        {
                d = &prog->fielddefs[i];
                name = PRVM_GetString(d->s_name);
+
+               if(developer_entityparsing.integer)
+                       Con_Printf("PRVM_ED_Write: at entity %d field %s\n", PRVM_NUM_FOR_EDICT(ed), name);
+
                if (name[strlen(name)-2] == '_')
                        continue;       // skip _x, _y, _z vars
 
@@ -884,6 +894,10 @@ void PRVM_ED_WriteGlobals (qfile_t *f)
                        continue;
 
                name = PRVM_GetString(def->s_name);
+
+               if(developer_entityparsing.integer)
+                       Con_Printf("PRVM_ED_WriteGlobals: at global %s\n", name);
+
                FS_Printf(f,"\"%s\" ", name);
                FS_Printf(f,"\"%s\"\n", PRVM_UglyValueString((etype_t)type, (prvm_eval_t *)&prog->globals.generic[def->ofs]));
        }
@@ -908,12 +922,18 @@ void PRVM_ED_ParseGlobals (const char *data)
                if (com_token[0] == '}')
                        break;
 
+               if (developer_entityparsing.integer)
+                       Con_Printf("Key: \"%s\"", com_token);
+
                strlcpy (keyname, com_token, sizeof(keyname));
 
                // parse value
                if (!COM_ParseToken_Simple(&data, false, true))
                        PRVM_ERROR ("PRVM_ED_ParseGlobals: EOF without closing brace");
 
+               if (developer_entityparsing.integer)
+                       Con_Printf(" \"%s\"\n", com_token);
+
                if (com_token[0] == '}')
                        PRVM_ERROR ("PRVM_ED_ParseGlobals: closing brace without data");
 
@@ -1150,7 +1170,6 @@ 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;
@@ -1369,6 +1388,7 @@ void PRVM_FindOffsets(void)
 
        // server and client qc use a lot of similar fields, so this is combined
        prog->fieldoffsets.SendEntity                     = PRVM_ED_FindFieldOffset("SendEntity");
+       prog->fieldoffsets.SendFlags                      = PRVM_ED_FindFieldOffset("SendFlags");
        prog->fieldoffsets.Version                        = PRVM_ED_FindFieldOffset("Version");
        prog->fieldoffsets.alpha                          = PRVM_ED_FindFieldOffset("alpha");
        prog->fieldoffsets.ammo_cells1                    = PRVM_ED_FindFieldOffset("ammo_cells1");
@@ -1457,6 +1477,7 @@ void PRVM_FindOffsets(void)
        prog->fieldoffsets.viewzoom                       = PRVM_ED_FindFieldOffset("viewzoom");
        prog->fieldoffsets.yaw_speed                      = PRVM_ED_FindFieldOffset("yaw_speed");
        prog->fieldoffsets.clientcamera                   = PRVM_ED_FindFieldOffset("clientcamera");
+       prog->fieldoffsets.clientstatus                   = PRVM_ED_FindFieldOffset("clientstatus");
        prog->funcoffsets.CSQC_ConsoleCommand             = PRVM_ED_FindFunctionOffset("CSQC_ConsoleCommand");
        prog->funcoffsets.CSQC_Ent_Remove                 = PRVM_ED_FindFunctionOffset("CSQC_Ent_Remove");
        prog->funcoffsets.CSQC_Ent_Update                 = PRVM_ED_FindFunctionOffset("CSQC_Ent_Update");
@@ -1480,6 +1501,7 @@ void PRVM_FindOffsets(void)
        prog->funcoffsets.SV_OnEntityNoSpawnFunction      = PRVM_ED_FindFunctionOffset("SV_OnEntityNoSpawnFunction");
        prog->funcoffsets.GameCommand                     = PRVM_ED_FindFunctionOffset("GameCommand");
        prog->funcoffsets.SV_Shutdown                     = PRVM_ED_FindFunctionOffset("SV_Shutdown");
+       prog->funcoffsets.URI_Get_Callback                = PRVM_ED_FindFunctionOffset("URI_Get_Callback");
        prog->globaloffsets.SV_InitCmd                    = PRVM_ED_FindGlobalOffset("SV_InitCmd");
        prog->globaloffsets.self                          = PRVM_ED_FindGlobalOffset("self");
        prog->globaloffsets.time                          = PRVM_ED_FindGlobalOffset("time");
@@ -1509,6 +1531,7 @@ void PRVM_FindOffsets(void)
        prog->globaloffsets.sb_showscores                 = PRVM_ED_FindGlobalOffset("sb_showscores");
        prog->globaloffsets.drawfont                      = PRVM_ED_FindGlobalOffset("drawfont");
        prog->globaloffsets.require_spawnfunc_prefix      = PRVM_ED_FindGlobalOffset("require_spawnfunc_prefix");
+       prog->globaloffsets.worldstatus                   = PRVM_ED_FindGlobalOffset("worldstatus");
 
        // menu qc only uses some functions, nothing else
        prog->funcoffsets.m_draw                          = PRVM_ED_FindFunctionOffset("m_draw");
@@ -2483,6 +2506,8 @@ static qboolean PRVM_IsEdictRelevant(prvm_edict_t *edict)
                        {
                                // TODO someone add more stuff here
                                cl_entvars_t *ev = edict->fields.client;
+                               if(ev->entnum) // csqc networked
+                                       return true;
                                if(ev->modelindex) // visible ent?
                                        return true;
                                if(ev->effects) // particle effect?