patch from KrimZon adding DP_QC_ENTITYDATA extension

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

diff --git a/clvm_cmds.c b/clvm_cmds.c
index 430aec87c70dc4ae2a791569611f2d97e75a32b7..82cc5d492e787d6df31776b41609b94fc9f784bc 100644 (file)
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -3417,11 +3417,11 @@ VM_gecko_resize,                                        // #492 void gecko_resize( string name, float w, float h )
 VM_gecko_get_texture_extent,   // #493 vector gecko_get_texture_extent( string name )
 VM_crc16,                                              // #494 float(float caseinsensitive, string s, ...) crc16 = #494 (DP_QC_CRC16)
 VM_cvar_type,                                  // #495 float(string name) cvar_type = #495; (DP_QC_CVAR_TYPE)
-NULL,                                                  // #496
-NULL,                                                  // #497
-NULL,                                                  // #498
-NULL,                                                  // #499
-NULL,                                                  // #500
+VM_numentityfields,                            // #496 float() numentityfields = #496; (QP_QC_ENTITYDATA)
+VM_entityfieldname,                            // #497 string(float fieldnum) entityfieldname = #497; (DP_QC_ENTITYDATA)
+VM_entityfieldtype,                            // #498 float(float fieldnum) entityfieldtype = #498; (DP_QC_ENTITYDATA)
+VM_getentityfieldstring,               // #499 string(float fieldnum, entity ent) getentityfieldstring = #499; (DP_QC_ENTITYDATA)
+VM_putentityfieldstring,               // #500 float(float fieldnum, entity ent, string s) putentityfieldstring = #500; (DP_QC_ENTITYDATA)
 NULL,                                                  // #501
 NULL,                                                  // #502
 NULL,                                                  // #503

diff --git a/prvm_cmds.c b/prvm_cmds.c
index 084883c646ed54a0d7897736608a854e979198c1..8a8bdd994b89f4d19bbbbbe6b8a0fdaeec254549 100644 (file)
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -1771,6 +1771,155 @@ void VM_writetofile(void)
        PRVM_ED_Write (file, ent);
 }
 
+// KrimZon - DP_QC_ENTITYDATA
+/*
+=========
+VM_numentityfields
+
+float() numentityfields
+Return the number of entity fields - NOT offsets
+=========
+*/
+void VM_numentityfields(void)
+{
+       PRVM_G_FLOAT(OFS_RETURN) = prog->progs->numfielddefs;
+}
+
+// KrimZon - DP_QC_ENTITYDATA
+/*
+=========
+VM_entityfieldname
+
+string(float fieldnum) entityfieldname
+Return name of the specified field as a string, or empty if the field is invalid (warning)
+=========
+*/
+void VM_entityfieldname(void)
+{
+       ddef_t *d;
+       int i = (int)PRVM_G_FLOAT(OFS_PARM0);
+       
+       if (i < 0 || i >= prog->progs->numfielddefs)
+       {
+        VM_Warning("VM_entityfieldname: %s: field index out of bounds\n", PRVM_NAME);
+        PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString("");
+               return;
+       }
+       
+       d = &prog->fielddefs[i];
+       PRVM_G_INT(OFS_RETURN) = d->s_name; // presuming that s_name points to a string already
+}
+
+// KrimZon - DP_QC_ENTITYDATA
+/*
+=========
+VM_entityfieldtype
+
+float(float fieldnum) entityfieldtype
+=========
+*/
+void VM_entityfieldtype(void)
+{
+       ddef_t *d;
+       int i = (int)PRVM_G_FLOAT(OFS_PARM0);
+       
+       if (i < 0 || i >= prog->progs->numfielddefs)
+       {
+               VM_Warning("VM_entityfieldtype: %s: field index out of bounds\n", PRVM_NAME);
+               PRVM_G_FLOAT(OFS_RETURN) = -1.0;
+               return;
+       }
+       
+       d = &prog->fielddefs[i];
+       PRVM_G_FLOAT(OFS_RETURN) = (float)d->type;
+}
+
+// KrimZon - DP_QC_ENTITYDATA
+/*
+=========
+VM_getentityfieldstring
+
+string(float fieldnum, entity ent) getentityfieldstring
+=========
+*/
+void VM_getentityfieldstring(void)
+{
+       // put the data into a string
+       ddef_t *d;
+       int type, j;
+       int *v;
+       prvm_edict_t * ent;
+       int i = (int)PRVM_G_FLOAT(OFS_PARM0);
+       
+       if (i < 0 || i >= prog->progs->numfielddefs)
+       {
+        VM_Warning("VM_entityfielddata: %s: field index out of bounds\n", PRVM_NAME);
+               PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString("");
+               return;
+       }
+       
+       d = &prog->fielddefs[i];
+       
+       // get the entity
+       ent = PRVM_G_EDICT(OFS_PARM1);
+       if(ent->priv.required->free)
+       {
+               PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString("");
+               VM_Warning("VM_entityfielddata: %s: entity %i is free !\n", PRVM_NAME, PRVM_NUM_FOR_EDICT(ent));
+               return;
+       }
+       v = (int *)((char *)ent->fields.vp + d->ofs*4);
+       
+       // if it's 0 or blank, return an empty string
+       type = d->type & ~DEF_SAVEGLOBAL;
+       for (j=0 ; j<prvm_type_size[type] ; j++)
+               if (v[j])
+                       break;
+       if (j == prvm_type_size[type])
+       {
+               PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString("");
+               return;
+       }
+               
+       PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(PRVM_UglyValueString((etype_t)d->type, (prvm_eval_t *)v));
+}
+
+// KrimZon - DP_QC_ENTITYDATA
+/*
+=========
+VM_putentityfieldstring
+
+float(float fieldnum, entity ent, string s) putentityfieldstring
+=========
+*/
+void VM_putentityfieldstring(void)
+{
+       ddef_t *d;
+       prvm_edict_t * ent;
+       int i = (int)PRVM_G_FLOAT(OFS_PARM0);
+
+       if (i < 0 || i >= prog->progs->numfielddefs)
+       {
+        VM_Warning("VM_entityfielddata: %s: field index out of bounds\n", PRVM_NAME);
+               PRVM_G_FLOAT(OFS_RETURN) = 0.0f;
+               return;
+       }
+
+       d = &prog->fielddefs[i];
+
+       // get the entity
+       ent = PRVM_G_EDICT(OFS_PARM1);
+       if(ent->priv.required->free)
+       {
+               VM_Warning("VM_entityfielddata: %s: entity %i is free !\n", PRVM_NAME, PRVM_NUM_FOR_EDICT(ent));
+               PRVM_G_FLOAT(OFS_RETURN) = 0.0f;
+               return;
+       }
+
+       // parse the string into the value
+       PRVM_G_FLOAT(OFS_RETURN) = ( PRVM_ED_ParseEpair(ent, d, PRVM_G_STRING(OFS_PARM2)) ) ? 1.0f : 0.0f;
+}
+
 /*
 =========
 VM_strlen

diff --git a/prvm_cmds.h b/prvm_cmds.h
index 88d0767c308966c172031f161dbc4def2b1143ba..373cb00deaf99085f9907001f67503cd42895ddd 100644 (file)
--- a/prvm_cmds.h
+++ b/prvm_cmds.h
@@ -299,6 +299,17 @@ void VM_stov(void);
 void VM_strzone(void);
 void VM_strunzone(void);
 
+// KrimZon - DP_QC_ENTITYDATA
+void VM_numentityfields(void);
+void VM_entityfieldname(void);
+void VM_entityfieldtype(void);
+void VM_getentityfieldstring(void);
+void VM_putentityfieldstring(void);
+// And declared these ones for VM_getentityfieldstring and VM_putentityfieldstring in prvm_cmds.c
+// the function is from prvm_edict.c
+char *PRVM_UglyValueString (etype_t type, prvm_eval_t *val);
+qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s);
+
 // DRESK - String Length (not counting color codes)
 void VM_strlennocol(void);
 // DRESK - Decolorized String

diff --git a/svvm_cmds.c b/svvm_cmds.c
index 4d3e0781a0690431f0f73af492f9f17f72a746c9..36ec9c8387665573cab8dbf5f91bdbd76500ca8b 100644 (file)
--- a/svvm_cmds.c
+++ b/svvm_cmds.c
@@ -62,6 +62,7 @@ char *vm_sv_extensions =
 "DP_QC_CVAR_STRING "
 "DP_QC_CVAR_TYPE "
 "DP_QC_EDICT_NUM "
+"DP_QC_ENTITYDATA "
 "DP_QC_ETOS "
 "DP_QC_FINDCHAIN "
 "DP_QC_FINDCHAINFLAGS "
@@ -3356,11 +3357,11 @@ NULL,                                                   // #492
 NULL,                                                  // #493
 VM_crc16,                                              // #494 float(float caseinsensitive, string s, ...) crc16 = #494 (DP_QC_CRC16)
 VM_cvar_type,                                  // #495 float(string name) cvar_type = #495; (DP_QC_CVAR_TYPE)
-NULL,                                                  // #496
-NULL,                                                  // #497
-NULL,                                                  // #498
-NULL,                                                  // #499
-NULL,                                                  // #500
+VM_numentityfields,                            // #496 float() numentityfields = #496; (DP_QC_ENTITYDATA)
+VM_entityfieldname,                            // #497 string(float fieldnum) entityfieldname = #497; (DP_QC_ENTITYDATA)
+VM_entityfieldtype,                            // #498 float(float fieldnum) entityfieldtype = #498; (DP_QC_ENTITYDATA)
+VM_getentityfieldstring,               // #499 string(float fieldnum, entity ent) getentityfieldstring = #499; (DP_QC_ENTITYDATA)
+VM_putentityfieldstring,               // #500 float(float fieldnum, entity ent, string s) putentityfieldstring = #500; (DP_QC_ENTITYDATA)
 NULL,                                                  // #501
 NULL,                                                  // #502
 NULL,                                                  // #503