Removed LoadLMPAs8Bit; the menu now uses LoadLMP directly

[xonotic/darkplaces.git] / progsvm.h

diff --git a/progsvm.h b/progsvm.h
index 3e64d430e72a2b1afa1559a4905cd183c99d0c5b..56b832d6f8523803af338988c3b4870153772b48 100644 (file)
--- a/progsvm.h
+++ b/progsvm.h
@@ -170,7 +170,27 @@ typedef struct prvm_edict_s
 {
        // engine-private fields (stored in dynamically resized array)
        //edict_engineprivate_t *e;
-       prvm_edict_private_t *e;
+       union 
+       {
+               prvm_edict_private_t *e;
+               void                             *vp;
+               // add other private structs as you desire
+               // new structs have to start with the elements of prvm_edit_private_t
+               // e.g. a new struct has to either look like this:
+               //      typedef struct server_edict_private_s {
+               //              prvm_edict_private_t base;
+               //              vec3_t moved_from;
+               //      vec3_t moved_fromangles;
+               //              ... } server_edict_private_t;
+               // or:
+               //      typedef struct server_edict_private_s {
+               //              qboolean free;
+               //              float freetime;
+               //              vec3_t moved_from;
+               //      vec3_t moved_fromangles;
+               //              ... } server_edict_private_t;
+               // However, the first one should be preferred.
+       } p;
        // QuakeC fields (stored in dynamically resized array)
        //entvars_t *v;
        void *v;
@@ -410,7 +430,7 @@ prvm_edict_t *PRVM_EDICT_NUM_ERROR(int n, char *filename, int fileline);
 
 // FIXME: make these go away?
 #define        PRVM_E_FLOAT(e,o) (((float*)e->v)[o])
-//#define      PRVM_E_INT(e,o) (((int*)e->v)[o])
+#define        PRVM_E_INT(e,o) (((int*)e->v)[o])
 //#define      PRVM_E_VECTOR(e,o) (&((float*)e->v)[o])
 #define        PRVM_E_STRING(e,o) (PRVM_GetString(*(string_t *)&((float*)e->v)[o]))