X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=progsvm.h;h=0ef7dff3fc161e6fd32102bc8d1cc08d21f767e9;hb=cb872df2ca589d4b30c733dc239986dfd64f0c12;hp=aae25ce99ca5612ab353b5bc2ed0a422f34af7e8;hpb=621a8739ffcb6a3dd5dadbf6417ed0b7a9cc3e73;p=xonotic%2Fdarkplaces.git

diff --git a/progsvm.h b/progsvm.h
index aae25ce9..0ef7dff3 100644
--- a/progsvm.h
+++ b/progsvm.h
@@ -31,6 +31,7 @@ The code uses void pointers instead.
 
 #include "pr_comp.h"			// defs shared with qcc
 #include "progdefs.h"			// generated by program cdefs
+#include "clprogdefs.h"			// generated by program cdefs
 
 /*
 typedef union vm_eval_s
@@ -203,11 +204,12 @@ typedef struct prvm_edict_s
 	union
 	{
 		void *vp;
-		entvars_t *server;
+		entvars_t		*server;
+		cl_entvars_t	*client;
 	} fields;
 } prvm_edict_t;
 
-#define PRVM_GETEDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (prvm_eval_t *)((qbyte *)ed->fields.vp + fieldoffset) : NULL)
+#define PRVM_GETEDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (prvm_eval_t *)((unsigned char *)ed->fields.vp + fieldoffset) : NULL)
 
 /*// this struct is the basic requirement for a qc prog
 typedef struct prvm_pr_globalvars_s
@@ -266,6 +268,7 @@ typedef struct prvm_prog_s
 	union {
 		float *generic;
 		globalvars_t *server;
+		cl_globalvars_t *client;
 	} globals;
 
 	int					maxknownstrings;
@@ -274,7 +277,7 @@ typedef struct prvm_prog_s
 	// (simple optimization of the free string search)
 	int					firstfreeknownstring;
 	const char			**knownstrings;
-	qbyte				*knownstrings_freeable;
+	unsigned char				*knownstrings_freeable;
 	const char			***stringshash;
 
 	// all memory allocations related to this vm_prog (code, edicts, strings)