X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=progsvm.h;h=15c3e5a1cc4ed9875550e1f73287966589264b0a;hb=2d55895c59ebeaff8c2a1e1f33a1c8cd9bc5c714;hp=e6dcafef31ee66cfb2a90de1017d38dde767e8e7;hpb=21ded8df6a28011633098ac23f92cd5a7f8250bc;p=xonotic%2Fdarkplaces.git diff --git a/progsvm.h b/progsvm.h index e6dcafef..15c3e5a1 100644 --- a/progsvm.h +++ b/progsvm.h @@ -185,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 @@ -220,6 +221,7 @@ typedef struct prvm_prog_globaloffsets_s int v_forward; // ssqc / csqc int v_right; // ssqc / csqc int v_up; // ssqc / csqc + int view_angles; // csqc int trace_allsolid; // ssqc / csqc int trace_startsolid; // ssqc / csqc int trace_fraction; // ssqc / csqc @@ -484,8 +486,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))