changed fieldoffsets and globaloffsets to be integer array indices instead of byte...

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

diff --git a/progs.h b/progs.h
index 2cacafbef5445a3cf12ea79579b27e1d771008ec..79e625647737fecc32a096d74cd31cde96190310 100644 (file)
--- a/progs.h
+++ b/progs.h
@@ -137,7 +137,7 @@ typedef struct edict_s
 }
 prvm_edict_t;
 
-#define PRVM_EDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (prvm_eval_t *)((unsigned char *)ed->v + fieldoffset) : NULL)
+#define PRVM_EDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (prvm_eval_t *)((int *)ed->v + fieldoffset) : NULL)
 
 //============================================================================
 

diff --git a/progsvm.h b/progsvm.h
index 17f93f2df4933895bfebb14aeaea203688d7de5a..0626ec3b2edc59cf6d119728356746fb46a50fef 100644 (file)
--- a/progsvm.h
+++ b/progsvm.h
@@ -103,8 +103,8 @@ typedef struct prvm_edict_s
        } fields;
 } prvm_edict_t;
 
-#define PRVM_EDICTFIELDVALUE(ed, fieldoffset) (fieldoffset >= 0 ? (prvm_eval_t *)((unsigned char *)ed->fields.vp + fieldoffset) : NULL)
-#define PRVM_GLOBALFIELDVALUE(fieldoffset) (fieldoffset >= 0 ? (prvm_eval_t *)((unsigned char *)prog->globals.generic + fieldoffset) : NULL)
+#define PRVM_EDICTFIELDVALUE(ed, fieldoffset) (fieldoffset >= 0 ? (prvm_eval_t *)((int *)ed->fields.vp + fieldoffset) : NULL)
+#define PRVM_GLOBALFIELDVALUE(fieldoffset) (fieldoffset >= 0 ? (prvm_eval_t *)((int *)prog->globals.generic + fieldoffset) : NULL)
 
 //============================================================================
 #define PRVM_OP_STATE          1

diff --git a/prvm_edict.c b/prvm_edict.c
index 368196dfce491737cde8e32fa65fb6aa7dac7aca..cc02e01334e27660ed03c4f81ac470e554e5692d 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -123,7 +123,7 @@ int PRVM_ED_FindFieldOffset(const char *field)
        d = PRVM_ED_FindField(field);
        if (!d)
                return -1;
-       return d->ofs*4;
+       return d->ofs;
 }
 
 int PRVM_ED_FindGlobalOffset(const char *global)
@@ -132,7 +132,7 @@ int PRVM_ED_FindGlobalOffset(const char *global)
        d = PRVM_ED_FindGlobal(global);
        if (!d)
                return -1;
-       return d->ofs*4;
+       return d->ofs;
 }
 
 func_t PRVM_ED_FindFunctionOffset(const char *function)