moved rsurface_ variables into rsurface struct as a minor cleanup

[xonotic/darkplaces.git] / progsvm.h

diff --git a/progsvm.h b/progsvm.h
index c9cb69f27106c4b708bcd4b5e027756000fbce39..eb36fd7e2a0115e2b9474ffaf80762bd311ed833 100644 (file)
--- a/progsvm.h
+++ b/progsvm.h
@@ -124,7 +124,6 @@ typedef struct prvm_prog_fieldoffsets_s
        int SendEntity; // ssqc
        int Version; // ssqc
        int alpha; // ssqc / csqc
-       int allowtouchwithowner;
        int ammo_cells1; // ssqc - Dissolution of Eternity mission pack
        int ammo_lava_nails; // ssqc - Dissolution of Eternity mission pack
        int ammo_multi_rockets; // ssqc - Dissolution of Eternity mission pack
@@ -186,6 +185,7 @@ typedef struct prvm_prog_fieldoffsets_s
        int items2; // ssqc
        int lerpfrac; // csqc
        int light_lev; // ssqc
+       int modelflags; // ssqc
        int movement; // ssqc
        int nextthink; // common - used by OP_STATE
        int netaddress; // ssqc
@@ -485,8 +485,7 @@ void PRVM_ED_ParseGlobals (const char *data);
 void PRVM_ED_LoadFromFile (const char *data);
 
 prvm_edict_t *PRVM_EDICT_NUM_ERROR(int n, char *filename, int fileline);
-#define        PRVM_EDICT_NUM(n) (((n) >= 0 && (n) < prog->max_edicts) ? prog->edicts + (n) : PRVM_EDICT_NUM_ERROR(n, __FILE__, __LINE__))
-#define        PRVM_EDICT_NUM_UNSIGNED(n) (((n) < prog->max_edicts) ? prog->edicts + (n) : PRVM_EDICT_NUM_ERROR(n, __FILE__, __LINE__))
+#define        PRVM_EDICT_NUM(n) (((unsigned)(n) < (unsigned int)prog->max_edicts) ? prog->edicts + (n) : PRVM_EDICT_NUM_ERROR(n, __FILE__, __LINE__))
 
 //int NUM_FOR_EDICT_ERROR(prvm_edict_t *e);
 #define PRVM_NUM_FOR_EDICT(e) ((int)((prvm_edict_t *)(e) - prog->edicts))