X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=csprogs.c;h=5b8032769c5db889c2d01bdbf62f274dbd67fa93;hb=0144ec3bdff2b7e8397be064cb7850a1ece7bce9;hp=45f164935e4f97fecfef8c62037fb2fe394a1d1d;hpb=cb02f6ad52202d505753eb88b21d0b79ef0d447c;p=xonotic%2Fdarkplaces.git

diff --git a/csprogs.c b/csprogs.c
index 45f16493..5b803276 100644
--- a/csprogs.c
+++ b/csprogs.c
@@ -2,6 +2,8 @@
 #include "progsvm.h"
 #include "clprogdefs.h"
 #include "csprogs.h"
+#include "cl_collision.h"
+#include "snd_main.h"
 
 //============================================================================
 // Client prog handling
@@ -13,89 +15,16 @@
 static prvm_prog_t *csqc_tmpprog;
 
 //[515]: these are required funcs
-#define CL_F_INIT				"CSQC_Init"
-#define CL_F_INPUTEVENT			"CSQC_InputEvent"
-#define CL_F_UPDATEVIEW			"CSQC_UpdateView"
-#define CL_F_CONSOLECOMMAND		"CSQC_ConsoleCommand"
-#define CL_F_SHUTDOWN			"CSQC_Shutdown"
-
-//[515]: these are optional
-#define CL_F_PARSE_TEMPENTITY	"CSQC_Parse_TempEntity"	//[515]: very helpfull when you want to create your own particles/decals/etc for effects that already exist
-#define CL_F_PARSE_STUFFCMD		"CSQC_Parse_StuffCmd"
-#define CL_F_PARSE_PRINT		"CSQC_Parse_Print"
-#define CL_F_PARSE_CENTERPRINT	"CSQC_Parse_CenterPrint"
-#define CL_F_ENT_UPDATE			"CSQC_Ent_Update"
-#define CL_F_ENT_REMOVE			"CSQC_Ent_Remove"
-#define CL_F_EVENT				"CSQC_Event"	//[515]: engine call this for its own needs
-												//so csqc can do some things according to what engine it's running on
-												//example: to say about edicts increase, whatever...
-
-#define CSQC_PRINTBUFFERLEN		8192	//[515]: enough ?
-
 static char *cl_required_func[] =
 {
-	CL_F_INIT,
-	CL_F_INPUTEVENT,
-	CL_F_UPDATEVIEW,
-	CL_F_CONSOLECOMMAND,
-	CL_F_SHUTDOWN
+	"CSQC_Init",
+	"CSQC_InputEvent",
+	"CSQC_UpdateView",
+	"CSQC_ConsoleCommand",
 };
 
 static int cl_numrequiredfunc = sizeof(cl_required_func) / sizeof(char*);
 
-static char				*csqc_printtextbuf = NULL;
-static unsigned short	*csqc_sv2csqcents;	//[515]: server entities numbers on client side. FIXME : make pointers instead of numbers ?
-
-static mfunction_t	*CSQC_Parse_TempEntity;
-static mfunction_t	*CSQC_Parse_StuffCmd;
-static mfunction_t	*CSQC_Parse_Print;
-static mfunction_t	*CSQC_Parse_CenterPrint;
-static mfunction_t	*CSQC_Ent_Update;
-static mfunction_t	*CSQC_Ent_Remove;
-static mfunction_t	*CSQC_Event;
-
-static int csqc_fieldoff_alpha;
-static int csqc_fieldoff_colormod;
-static int csqc_fieldoff_effects;
-int csqc_fieldoff_scale;
-int csqc_fieldoff_renderflags;
-int csqc_fieldoff_tag_entity;
-int csqc_fieldoff_tag_index;
-int csqc_fieldoff_dphitcontentsmask;
-
-qboolean csqc_loaded = false;
-
-vec3_t csqc_origin, csqc_angles;
-static double csqc_frametime = 0;
-int csqc_buttons;
-
-static mempool_t *csqc_mempool;
-
-static void CL_VM_FindEdictFieldOffsets (void)
-{
-	csqc_fieldoff_alpha			= PRVM_ED_FindFieldOffset("alpha");
-	csqc_fieldoff_scale			= PRVM_ED_FindFieldOffset("scale");
-	csqc_fieldoff_colormod		= PRVM_ED_FindFieldOffset("colormod");
-	csqc_fieldoff_renderflags	= PRVM_ED_FindFieldOffset("renderflags");
-	csqc_fieldoff_effects		= PRVM_ED_FindFieldOffset("effects");
-	csqc_fieldoff_tag_entity	= PRVM_ED_FindFieldOffset("tag_entity");
-	csqc_fieldoff_tag_index		= PRVM_ED_FindFieldOffset("tag_index");
-
-	CSQC_Parse_TempEntity		= PRVM_ED_FindFunction (CL_F_PARSE_TEMPENTITY);
-	CSQC_Parse_StuffCmd			= PRVM_ED_FindFunction (CL_F_PARSE_STUFFCMD);
-	CSQC_Parse_Print			= PRVM_ED_FindFunction (CL_F_PARSE_PRINT);
-	CSQC_Parse_CenterPrint		= PRVM_ED_FindFunction (CL_F_PARSE_CENTERPRINT);
-	CSQC_Ent_Update				= PRVM_ED_FindFunction (CL_F_ENT_UPDATE);
-	CSQC_Ent_Remove				= PRVM_ED_FindFunction (CL_F_ENT_REMOVE);
-	CSQC_Event					= PRVM_ED_FindFunction (CL_F_EVENT);
-
-	if(CSQC_Parse_Print)
-	{
-		csqc_printtextbuf = (char *)Mem_Alloc(csqc_mempool, CSQC_PRINTBUFFERLEN);
-		csqc_printtextbuf[0] = 0;
-	}
-}
-
 void CL_VM_Error (const char *format, ...) DP_FUNC_PRINTF(1);
 void CL_VM_Error (const char *format, ...)	//[515]: hope it will be never executed =)
 {
@@ -108,8 +37,7 @@ void CL_VM_Error (const char *format, ...)	//[515]: hope it will be never execut
 //	Con_Printf( "CL_VM_Error: %s\n", errorstring );
 
 	PRVM_Crash();
-	csqc_loaded = false;
-	Mem_FreePool(&csqc_mempool);
+	cl.csqc_loaded = false;
 
 	Cvar_SetValueQuick(&csqc_progcrc, -1);
 	Cvar_SetValueQuick(&csqc_progsize, -1);
@@ -117,53 +45,53 @@ void CL_VM_Error (const char *format, ...)	//[515]: hope it will be never execut
 //	Host_AbortCurrentFrame();	//[515]: hmmm... if server says it needs csqc then client MUST disconnect
 	Host_Error(va("CL_VM_Error: %s", errorstring));
 }
-
-model_t *CSQC_GetModelByIndex(int modelindex)
+void CL_VM_UpdateDmgGlobals (int dmg_take, int dmg_save, vec3_t dmg_origin)
 {
-	if(!modelindex)
-		return NULL;
-	if (modelindex < 0)
-	{
-		modelindex = -(modelindex+1);
-		if (modelindex < MAX_MODELS)
-			return cl.csqc_model_precache[modelindex];
-	}
-	else
+	prvm_eval_t *val;
+	if(cl.csqc_loaded)
 	{
-		if(modelindex < MAX_MODELS)
-			return cl.model_precache[modelindex];
+		CSQC_BEGIN
+		val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.dmg_take);
+		if(val)
+			val->_float = dmg_take;
+		val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.dmg_save);
+		if(val)
+			val->_float = dmg_save;
+		val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.dmg_origin);
+		if(val)
+		{
+			val->vector[0] = dmg_origin[0];
+			val->vector[1] = dmg_origin[1];
+			val->vector[2] = dmg_origin[2];
+		}
+		CSQC_END
 	}
-	return NULL;
 }
-
-model_t *CSQC_GetModelFromEntity(prvm_edict_t *ed)
-{
-	if (!ed || ed->priv.server->free)
-		return NULL;
-	return CSQC_GetModelByIndex((int)ed->fields.client->modelindex);
-}
-
 //[515]: set globals before calling R_UpdateView, WEIRD CRAP
 static void CSQC_SetGlobals (void)
 {
-	//extern cvar_t sv_accelerate, sv_friction, sv_gravity, sv_stopspeed, sv_maxspeed;
-
+	prvm_eval_t *val;
 	CSQC_BEGIN
-		*prog->time = cl.time;
-		prog->globals.client->frametime = cl.time - csqc_frametime;
-		csqc_frametime = cl.time;
-		prog->globals.client->servercommandframe = cl.servermovesequence;
-		prog->globals.client->clientcommandframe = cl.movemessages;
+		prog->globals.client->time = cl.time;
+		prog->globals.client->frametime = max(0, cl.time - cl.oldtime);
+		prog->globals.client->servercommandframe = cls.servermovesequence;
+		prog->globals.client->clientcommandframe = cl.movecmd[0].sequence;
 		VectorCopy(cl.viewangles, prog->globals.client->input_angles);
-		VectorCopy(cl.viewangles, csqc_angles);
-		prog->globals.client->input_buttons = csqc_buttons;
-		VectorSet(prog->globals.client->input_movevalues, cl.cmd.forwardmove, cl.cmd.sidemove, cl.cmd.upmove);
-		//VectorCopy(cl.movement_origin, csqc_origin);
-		Matrix4x4_OriginFromMatrix(&cl.entities[cl.viewentity].render.matrix, csqc_origin);
-		VectorCopy(csqc_origin, prog->globals.client->pmove_org);
-		prog->globals.client->maxclients = cl.maxclients;
-		//VectorCopy(cl.movement_velocity, prog->globals.client->pmove_vel);
+		VectorCopy(cl.viewangles, cl.csqc_angles);
+		prog->globals.client->input_buttons = cl.movecmd[0].buttons;
+		VectorSet(prog->globals.client->input_movevalues, cl.movecmd[0].forwardmove, cl.movecmd[0].sidemove, cl.movecmd[0].upmove);
+		//VectorCopy(cl.movement_origin, cl.csqc_origin);
+		Matrix4x4_OriginFromMatrix(&cl.entities[cl.viewentity].render.matrix, cl.csqc_origin);
+
+		// LordHavoc: Spike says not to do this, but without pmove_org the
+		// CSQC is useless as it can't alter the view origin without
+		// completely replacing it
+		VectorCopy(cl.csqc_origin, prog->globals.client->pmove_org);
 		VectorCopy(cl.velocity, prog->globals.client->pmove_vel);
+
+		if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.view_angles)))
+			VectorCopy(cl.viewangles, val->vector);
+		prog->globals.client->maxclients = cl.maxclients;
 	CSQC_END
 }
 
@@ -182,7 +110,7 @@ void CSQC_Think (prvm_edict_t *ed)
 {
 	int b;
 	if(ed->fields.client->think)
-	if(ed->fields.client->nextthink && ed->fields.client->nextthink <= *prog->time)
+	if(ed->fields.client->nextthink && ed->fields.client->nextthink <= prog->globals.client->time)
 	{
 		ed->fields.client->nextthink = 0;
 		b = prog->globals.client->self;
@@ -195,14 +123,14 @@ void CSQC_Think (prvm_edict_t *ed)
 extern cvar_t cl_noplayershadow;
 qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 {
-	int i;
+	int renderflags;
 	float scale;
 	prvm_eval_t *val;
 	entity_t *e;
 	model_t *model;
 	matrix4x4_t tagmatrix, matrix2;
 
-	model = CSQC_GetModelFromEntity(ed);
+	model = CL_GetModelFromEdict(ed);
 	if (!model)
 		return false;
 
@@ -212,21 +140,21 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 
 	e->render.model = model;
 	e->render.colormap = (int)ed->fields.client->colormap;
-	e->render.frame = (int)ed->fields.client->frame;
 	e->render.skinnum = (int)ed->fields.client->skin;
-	e->render.effects |= e->render.model->flags2 & (EF_FULLBRIGHT | EF_ADDITIVE);
+	e->render.effects |= e->render.model->effects;
 	scale = 1;
-
-	if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_alpha)) && val->_float)		e->render.alpha = val->_float;
-	if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_scale)) && val->_float)		e->render.scale = scale = val->_float;
-	if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_colormod)) && VectorLength2(val->vector))	VectorCopy(val->vector, e->render.colormod);
-	if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_effects)) && val->_float)	e->render.effects = (int)val->_float;
-	if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_tag_entity)) && val->edict)
+	renderflags = 0;
+	if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.renderflags)) && val->_float)	renderflags = (int)val->_float;
+	if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.alpha)) && val->_float)		e->render.alpha = val->_float;
+	if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.scale)) && val->_float)		e->render.scale = scale = val->_float;
+	if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.colormod)) && VectorLength2(val->vector))	VectorCopy(val->vector, e->render.colormod);
+	if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.effects)) && val->_float)	e->render.effects |= (int)val->_float;
+	if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.tag_entity)) && val->edict)
 	{
 		int tagentity;
 		int tagindex = 0;
 		tagentity = val->edict;
-		if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_tag_index)) && val->_float)
+		if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.tag_index)) && val->_float)
 			tagindex = (int)val->_float;
 		// FIXME: calculate tag matrix
 		Matrix4x4_CreateIdentity(&tagmatrix);
@@ -234,11 +162,12 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 	else
 		Matrix4x4_CreateIdentity(&tagmatrix);
 
-	if(i & RF_USEAXIS)	//FIXME!!!
+	if (renderflags & RF_USEAXIS)
 	{
 		vec3_t left;
 		VectorNegate(prog->globals.client->v_right, left);
 		Matrix4x4_FromVectors(&matrix2, prog->globals.client->v_forward, left, prog->globals.client->v_up, ed->fields.client->origin);
+		Matrix4x4_Scale(&matrix2, scale, 1);
 	}
 	else
 	{
@@ -252,41 +181,60 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 		Matrix4x4_CreateFromQuakeEntity(&matrix2, ed->fields.client->origin[0], ed->fields.client->origin[1], ed->fields.client->origin[2], angles[0], angles[1], angles[2], scale);
 	}
 
-	// FIXME: csqc has frame1/frame2/frame1time/frame2time/lerpfrac but this implementation's cl_entvars_t lacks those fields
-	e->render.frame1 = e->render.frame = ed->fields.client->frame;
-	e->render.frame1time = e->render.frame2time = 0;
-	e->render.framelerp = 0;
+	// set up the animation data
+	// self.frame is the interpolation target (new frame)
+	// self.frame1time is the animation base time for the interpolation target
+	// self.frame2 is the interpolation start (previous frame)
+	// self.frame2time is the animation base time for the interpolation start
+	e->render.frame1 = e->render.frame2 = ed->fields.client->frame;
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2))) e->render.frame2 = val->_float;
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame1time))) e->render.frame2time = val->_float;
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2time))) e->render.frame1time = val->_float;
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.lerpfrac))) e->render.framelerp = val->_float;
 
 	// concat the matrices to make the entity relative to its tag
 	Matrix4x4_Concat(&e->render.matrix, &tagmatrix, &matrix2);
 	// make the other useful stuff
 	CL_UpdateRenderEntity(&e->render);
 
-	i = 0;
-	if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_renderflags)) && val->_float)
+	if(renderflags)
 	{
-		i = (int)val->_float;
-		if(i & RF_VIEWMODEL)	e->render.flags |= RENDER_VIEWMODEL;
-		if(i & RF_EXTERNALMODEL)e->render.flags |= RENDER_EXTERIORMODEL;
-		if(i & RF_DEPTHHACK)	e->render.effects |= EF_NODEPTHTEST;
-		if(i & RF_ADDITIVE)		e->render.effects |= EF_ADDITIVE;
+		if(renderflags & RF_VIEWMODEL)	e->render.flags |= RENDER_VIEWMODEL;
+		if(renderflags & RF_EXTERNALMODEL)e->render.flags |= RENDER_EXTERIORMODEL;
+		if(renderflags & RF_DEPTHHACK)	e->render.effects |= EF_NODEPTHTEST;
+		if(renderflags & RF_ADDITIVE)		e->render.effects |= EF_ADDITIVE;
+	}
+
+	if ((e->render.colormap > 0 && e->render.colormap <= cl.maxclients) || e->render.colormap >= 1024)
+	{
+		unsigned char *cbcolor;
+		int palcol;
+		if (e->render.colormap >= 1024)
+			palcol = (unsigned char)(e->render.colormap-1024);
+		else
+			palcol = cl.scores[e->render.colormap-1].colors;
+
+		cbcolor = palette_rgb_pantscolormap[palcol & 0xF];
+		e->render.colormap_pantscolor[0] = cbcolor[0] * (1.0f / 255.0f);
+		e->render.colormap_pantscolor[1] = cbcolor[1] * (1.0f / 255.0f);
+		e->render.colormap_pantscolor[2] = cbcolor[2] * (1.0f / 255.0f);
+		cbcolor = palette_rgb_shirtcolormap[(palcol & 0xF0) >> 4];
+		e->render.colormap_shirtcolor[0] = cbcolor[0] * (1.0f / 255.0f);
+		e->render.colormap_shirtcolor[1] = cbcolor[1] * (1.0f / 255.0f);
+		e->render.colormap_shirtcolor[2] = cbcolor[2] * (1.0f / 255.0f);
 	}
 
-	// transparent stuff can't be lit during the opaque stage
-	if (e->render.effects & (EF_ADDITIVE | EF_NODEPTHTEST) || e->render.alpha < 1)
-		e->render.flags |= RENDER_TRANSPARENT;
-	// double sided rendering mode causes backfaces to be visible
-	// (mostly useful on transparent stuff)
-	if (e->render.effects & EF_DOUBLESIDED)
-		e->render.flags |= RENDER_NOCULLFACE;
 	// either fullbright or lit
 	if (!(e->render.effects & EF_FULLBRIGHT) && !r_fullbright.integer)
 		e->render.flags |= RENDER_LIGHT;
 	// hide player shadow during intermission or nehahra movie
-	if (!(e->render.effects & EF_NOSHADOW)
-	 && !(e->render.flags & (RENDER_VIEWMODEL | RENDER_TRANSPARENT))
+	if (!(e->render.effects & (EF_NOSHADOW | EF_ADDITIVE | EF_NODEPTHTEST))
+	 &&  (e->render.alpha >= 1)
+	 && !(e->render.flags & RENDER_VIEWMODEL)
 	 && (!(e->render.flags & RENDER_EXTERIORMODEL) || (!cl.intermission && cls.protocol != PROTOCOL_NEHAHRAMOVIE && !cl_noplayershadow.integer)))
 		e->render.flags |= RENDER_SHADOW;
+	if (e->render.flags & RENDER_VIEWMODEL)
+		e->render.flags |= RENDER_NOSELFSHADOW;
 
 	return true;
 }
@@ -294,30 +242,44 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 qboolean CL_VM_InputEvent (qboolean pressed, int key)
 {
 	qboolean r;
-	if(!csqc_loaded)
+	if(!cl.csqc_loaded)
 		return false;
 	CSQC_BEGIN
-		*prog->time = cl.time;
-		PRVM_G_FLOAT(OFS_PARM0) = pressed;
-		PRVM_G_FLOAT(OFS_PARM1) = key;
-		PRVM_ExecuteProgram (prog->globals.client->CSQC_InputEvent, CL_F_INPUTEVENT);
-		r = CSQC_RETURNVAL;
+		if (!prog->funcoffsets.CSQC_InputEvent)
+			r = false;
+		else
+		{
+			prog->globals.client->time = cl.time;
+			PRVM_G_FLOAT(OFS_PARM0) = pressed;
+			PRVM_G_FLOAT(OFS_PARM1) = key;
+			PRVM_ExecuteProgram(prog->funcoffsets.CSQC_InputEvent, "QC function CSQC_InputEvent is missing");
+			r = CSQC_RETURNVAL;
+		}
 	CSQC_END
 	return r;
 }
 
 qboolean CL_VM_UpdateView (void)
 {
+	vec3_t emptyvector;
+	emptyvector[0] = 0;
+	emptyvector[1] = 0;
+	emptyvector[2] = 0;
 //	vec3_t oldangles;
-	if(!csqc_loaded)
+	if(!cl.csqc_loaded)
 		return false;
 	CSQC_BEGIN
 		//VectorCopy(cl.viewangles, oldangles);
-		*prog->time = cl.time;
+		prog->globals.client->time = cl.time;
 		CSQC_SetGlobals();
+		// clear renderable entity and light lists to prevent crashes if the
+		// CSQC_UpdateView function does not call R_ClearScene as it should
 		r_refdef.numentities = 0;
-		PRVM_ExecuteProgram (prog->globals.client->CSQC_UpdateView, CL_F_UPDATEVIEW);
+		r_refdef.numlights = 0;
+		PRVM_ExecuteProgram(prog->funcoffsets.CSQC_UpdateView, "QC function CSQC_UpdateView is missing");
 		//VectorCopy(oldangles, cl.viewangles);
+		// Dresk : Reset Dmg Globals Here
+		CL_VM_UpdateDmgGlobals(0, 0, emptyvector);
 	CSQC_END
 	return true;
 }
@@ -326,16 +288,19 @@ extern sizebuf_t vm_tempstringsbuf;
 qboolean CL_VM_ConsoleCommand (const char *cmd)
 {
 	int restorevm_tempstringsbuf_cursize;
-	qboolean r;
-	if(!csqc_loaded)
+	qboolean r = false;
+	if(!cl.csqc_loaded)
 		return false;
 	CSQC_BEGIN
-		*prog->time = cl.time;
+	if (prog->funcoffsets.CSQC_ConsoleCommand)
+	{
+		prog->globals.client->time = cl.time;
 		restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize;
 		PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(cmd);
-		PRVM_ExecuteProgram (prog->globals.client->CSQC_ConsoleCommand, CL_F_CONSOLECOMMAND);
+		PRVM_ExecuteProgram(prog->funcoffsets.CSQC_ConsoleCommand, "QC function CSQC_ConsoleCommand is missing");
 		vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
 		r = CSQC_RETURNVAL;
+	}
 	CSQC_END
 	return r;
 }
@@ -343,20 +308,23 @@ qboolean CL_VM_ConsoleCommand (const char *cmd)
 qboolean CL_VM_Parse_TempEntity (void)
 {
 	int			t;
-	qboolean	r;
-	if(!csqc_loaded || !CSQC_Parse_TempEntity)
+	qboolean	r = false;
+	if(!cl.csqc_loaded)
 		return false;
-	t = msg_readcount;
 	CSQC_BEGIN
-		*prog->time = cl.time;
-		PRVM_ExecuteProgram ((func_t)(CSQC_Parse_TempEntity - prog->functions), CL_F_PARSE_TEMPENTITY);
-		r = CSQC_RETURNVAL;
-	CSQC_END
-	if(!r)
+	if(prog->funcoffsets.CSQC_Parse_TempEntity)
 	{
-		msg_readcount = t;
-		msg_badread = false;
+		t = msg_readcount;
+		prog->globals.client->time = cl.time;
+		PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Parse_TempEntity, "QC function CSQC_Parse_TempEntity is missing");
+		r = CSQC_RETURNVAL;
+		if(!r)
+		{
+			msg_readcount = t;
+			msg_badread = false;
+		}
 	}
+	CSQC_END
 	return r;
 }
 
@@ -380,85 +348,187 @@ void CL_VM_Parse_StuffCmd (const char *msg)
 		csqc_progsize.flags = sizeflags;
 		return;
 	}
-	if(!csqc_loaded || !CSQC_Parse_StuffCmd)
+	if(!cl.csqc_loaded)
 	{
 		Cbuf_AddText(msg);
 		return;
 	}
 	CSQC_BEGIN
-		*prog->time = cl.time;
+	if(prog->funcoffsets.CSQC_Parse_StuffCmd)
+	{
+		prog->globals.client->time = cl.time;
 		restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize;
 		PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(msg);
-		PRVM_ExecuteProgram ((func_t)(CSQC_Parse_StuffCmd - prog->functions), CL_F_PARSE_STUFFCMD);
+		PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Parse_StuffCmd, "QC function CSQC_Parse_StuffCmd is missing");
 		vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
+	}
+	else
+		Cbuf_AddText(msg);
 	CSQC_END
 }
 
 static void CL_VM_Parse_Print (const char *msg)
 {
 	int restorevm_tempstringsbuf_cursize;
-	CSQC_BEGIN
-		*prog->time = cl.time;
-		restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize;
-		PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(msg);
-		PRVM_ExecuteProgram ((func_t)(CSQC_Parse_Print - prog->functions), CL_F_PARSE_PRINT);
-		vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
-	CSQC_END
+	prog->globals.client->time = cl.time;
+	restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize;
+	PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(msg);
+	PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Parse_Print, "QC function CSQC_Parse_Print is missing");
+	vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
 }
 
 void CSQC_AddPrintText (const char *msg)
 {
 	size_t i;
-	if(!csqc_loaded || !CSQC_Parse_Print)
+	if(!cl.csqc_loaded)
 	{
 		Con_Print(msg);
 		return;
 	}
-	// FIXME: is this bugged?
-	i = strlen(msg)-1;
-	if(msg[i] != '\n' && msg[i] != '\r')
+	CSQC_BEGIN
+	if(prog->funcoffsets.CSQC_Parse_Print)
 	{
-		if(strlen(csqc_printtextbuf)+i >= CSQC_PRINTBUFFERLEN)
+		// FIXME: is this bugged?
+		i = strlen(msg)-1;
+		if(msg[i] != '\n' && msg[i] != '\r')
 		{
-			CL_VM_Parse_Print(csqc_printtextbuf);
-			csqc_printtextbuf[0] = 0;
+			if(strlen(cl.csqc_printtextbuf)+i >= MAX_INPUTLINE)
+			{
+				CL_VM_Parse_Print(cl.csqc_printtextbuf);
+				cl.csqc_printtextbuf[0] = 0;
+			}
+			else
+				strlcat(cl.csqc_printtextbuf, msg, MAX_INPUTLINE);
+			return;
 		}
-		else
-			strlcat(csqc_printtextbuf, msg, CSQC_PRINTBUFFERLEN);
-		return;
+		strlcat(cl.csqc_printtextbuf, msg, MAX_INPUTLINE);
+		CL_VM_Parse_Print(cl.csqc_printtextbuf);
+		cl.csqc_printtextbuf[0] = 0;
 	}
-	strlcat(csqc_printtextbuf, msg, CSQC_PRINTBUFFERLEN);
-	CL_VM_Parse_Print(csqc_printtextbuf);
-	csqc_printtextbuf[0] = 0;
+	else
+		Con_Print(msg);
+	CSQC_END
 }
 
 void CL_VM_Parse_CenterPrint (const char *msg)
 {
 	int restorevm_tempstringsbuf_cursize;
-	if(!csqc_loaded || !CSQC_Parse_CenterPrint)
+	if(!cl.csqc_loaded)
 	{
 		SCR_CenterPrint((char*)msg);
 		return;
 	}
 	CSQC_BEGIN
-		*prog->time = cl.time;
+	if(prog->funcoffsets.CSQC_Parse_CenterPrint)
+	{
+		prog->globals.client->time = cl.time;
 		restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize;
 		PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(msg);
-		PRVM_ExecuteProgram ((func_t)(CSQC_Parse_CenterPrint - prog->functions), CL_F_PARSE_CENTERPRINT);
+		PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Parse_CenterPrint, "QC function CSQC_Parse_CenterPrint is missing");
 		vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
+	}
+	else
+		SCR_CenterPrint((char*)msg);
 	CSQC_END
 }
 
+void CL_VM_UpdateIntermissionState (int intermission)
+{
+	prvm_eval_t *val;
+	if(cl.csqc_loaded)
+	{
+		CSQC_BEGIN
+		val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.intermission);
+		if(val)
+			val->_float = intermission;
+		CSQC_END
+	}
+}
+void CL_VM_UpdateShowingScoresState (int showingscores)
+{
+	prvm_eval_t *val;
+	if(cl.csqc_loaded)
+	{
+		CSQC_BEGIN
+		val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.sb_showscores);
+		if(val)
+			val->_float = showingscores;
+		CSQC_END
+	}
+}
+qboolean CL_VM_Event_Sound(int sound_num, int volume, int channel, float attenuation, int ent, vec3_t pos)
+{
+	qboolean r = false;
+	if(cl.csqc_loaded)
+	{
+		CSQC_BEGIN
+		if(prog->funcoffsets.CSQC_Event_Sound)
+		{
+			prog->globals.client->time = cl.time;
+			PRVM_G_FLOAT(OFS_PARM0) = ent;
+			PRVM_G_FLOAT(OFS_PARM1) = channel;
+			PRVM_G_INT(OFS_PARM2) = PRVM_SetTempString(cl.sound_name[sound_num] );
+			PRVM_G_FLOAT(OFS_PARM3) = volume;
+			PRVM_G_FLOAT(OFS_PARM4) = attenuation;
+			VectorCopy(pos, PRVM_G_VECTOR(OFS_PARM5) );
+			PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Event_Sound, "QC function CSQC_Event_Sound is missing");
+			r = CSQC_RETURNVAL;
+		}
+		CSQC_END
+	}
+
+	return r;
+}
+void CL_VM_UpdateCoopDeathmatchGlobals (int gametype)
+{
+	// Avoid global names for clean(er) coding
+	int localcoop;
+	int localdeathmatch;
+
+	prvm_eval_t *val;
+	if(cl.csqc_loaded)
+	{
+		if(gametype == GAME_COOP)
+		{
+			localcoop = 1;
+			localdeathmatch = 0;
+		}
+		else
+		if(gametype == GAME_DEATHMATCH)
+		{
+			localcoop = 0;
+			localdeathmatch = 1;
+		}
+		else
+		{
+			// How did the ServerInfo send an unknown gametype?
+			// Better just assign the globals as 0...
+			localcoop = 0;
+			localdeathmatch = 0;
+		}
+		CSQC_BEGIN
+		val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.coop);
+		if(val)
+			val->_float = localcoop;
+		val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.deathmatch);
+		if(val)
+			val->_float = localdeathmatch;
+		CSQC_END
+	}
+}
 float CL_VM_Event (float event)		//[515]: needed ? I'd say "YES", but don't know for what :D
 {
-	float r;
-	if(!csqc_loaded || !CSQC_Event)
+	float r = 0;
+	if(!cl.csqc_loaded)
 		return 0;
 	CSQC_BEGIN
-		*prog->time = cl.time;
+	if(prog->funcoffsets.CSQC_Event)
+	{
+		prog->globals.client->time = cl.time;
 		PRVM_G_FLOAT(OFS_PARM0) = event;
-		PRVM_ExecuteProgram ((func_t)(CSQC_Event - prog->functions), CL_F_EVENT);
+		PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Event, "QC function CSQC_Event is missing");
 		r = CSQC_RETURNVAL;
+	}
 	CSQC_END
 	return r;
 }
@@ -466,22 +536,28 @@ float CL_VM_Event (float event)		//[515]: needed ? I'd say "YES", but don't know
 void CSQC_ReadEntities (void)
 {
 	unsigned short entnum, oldself, realentnum;
+	if(!cl.csqc_loaded)
+	{
+		Host_Error ("CSQC_ReadEntities: CSQC is not loaded");
+		return;
+	}
+
 	CSQC_BEGIN
-		*prog->time = cl.time;
+		prog->globals.client->time = cl.time;
 		oldself = prog->globals.client->self;
 		while(1)
 		{
 			entnum = MSG_ReadShort();
-			if(!entnum)
+			if(!entnum || msg_badread)
 				return;
 			realentnum = entnum & 0x7FFF;
-			prog->globals.client->self = csqc_sv2csqcents[realentnum];
+			prog->globals.client->self = cl.csqc_server2csqcentitynumber[realentnum];
 			if(entnum & 0x8000)
 			{
 				if(prog->globals.client->self)
 				{
-					PRVM_ExecuteProgram((func_t)(CSQC_Ent_Remove - prog->functions), CL_F_ENT_REMOVE);
-					csqc_sv2csqcents[realentnum] = 0;
+					PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Ent_Remove, "QC function CSQC_Ent_Remove is missing");
+					cl.csqc_server2csqcentitynumber[realentnum] = 0;
 				}
 				else
 					Con_Printf("Smth bad happens in csqc...\n");	//[515]: never happens ?
@@ -493,18 +569,84 @@ void CSQC_ReadEntities (void)
 					prvm_edict_t	*ed;
 					ed = PRVM_ED_Alloc();
 					ed->fields.client->entnum = realentnum;
-					prog->globals.client->self = csqc_sv2csqcents[realentnum] = PRVM_EDICT_TO_PROG(ed);
+					prog->globals.client->self = cl.csqc_server2csqcentitynumber[realentnum] = PRVM_EDICT_TO_PROG(ed);
 					PRVM_G_FLOAT(OFS_PARM0) = 1;
 				}
 				else
 					PRVM_G_FLOAT(OFS_PARM0) = 0;
-				PRVM_ExecuteProgram((func_t)(CSQC_Ent_Update - prog->functions), CL_F_ENT_UPDATE);
+				PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Ent_Update, "QC function CSQC_Ent_Update is missing");
 			}
 		}
 		prog->globals.client->self = oldself;
 	CSQC_END
 }
 
+void CL_VM_CB_BeginIncreaseEdicts(void)
+{
+	int i;
+	prvm_edict_t *ent;
+
+	// links don't survive the transition, so unlink everything
+	for (i = 0, ent = prog->edicts;i < prog->max_edicts;i++, ent++)
+	{
+		if (!ent->priv.server->free)
+			World_UnlinkEdict(prog->edicts + i);
+		memset(&ent->priv.server->areagrid, 0, sizeof(ent->priv.server->areagrid));
+	}
+	World_Clear(&cl.world);
+}
+
+void CL_VM_CB_EndIncreaseEdicts(void)
+{
+	int i;
+	prvm_edict_t *ent;
+
+	// link every entity except world
+	for (i = 1, ent = prog->edicts;i < prog->max_edicts;i++, ent++)
+		if (!ent->priv.server->free)
+			CL_LinkEdict(ent);
+}
+
+void CL_VM_CB_InitEdict(prvm_edict_t *e)
+{
+	e->priv.server->move = false; // don't move on first frame
+}
+
+void CL_VM_CB_FreeEdict(prvm_edict_t *ed)
+{
+	World_UnlinkEdict(ed);
+	memset(ed->fields.client, 0, sizeof(*ed->fields.client));
+}
+
+void CL_VM_CB_CountEdicts(void)
+{
+	int		i;
+	prvm_edict_t	*ent;
+	int		active = 0, models = 0, solid = 0;
+
+	for (i=0 ; i<prog->num_edicts ; i++)
+	{
+		ent = PRVM_EDICT_NUM(i);
+		if (ent->priv.server->free)
+			continue;
+		active++;
+		if (ent->fields.client->solid)
+			solid++;
+		if (ent->fields.client->model)
+			models++;
+	}
+
+	Con_Printf("num_edicts:%3i\n", prog->num_edicts);
+	Con_Printf("active    :%3i\n", active);
+	Con_Printf("view      :%3i\n", models);
+	Con_Printf("touch     :%3i\n", solid);
+}
+
+qboolean CL_VM_CB_LoadEdict(prvm_edict_t *ent)
+{
+	return true;
+}
+
 void Cmd_ClearCsqcFuncs (void);
 
 void CL_VM_Init (void)
@@ -513,6 +655,7 @@ void CL_VM_Init (void)
 	fs_offset_t csprogsdatasize;
 	int csprogsdatacrc, requiredcrc;
 	int requiredsize;
+	prvm_eval_t *val;
 
 	// reset csqc_progcrc after reading it, so that changing servers doesn't
 	// expect csqc on the next server
@@ -521,10 +664,6 @@ void CL_VM_Init (void)
 	Cvar_SetValueQuick(&csqc_progcrc, -1);
 	Cvar_SetValueQuick(&csqc_progsize, -1);
 
-	csqc_loaded = false;
-	memset(cl.csqc_model_precache, 0, sizeof(cl.csqc_model_precache));
-	memset(&cl.csqc_vidvars, true, sizeof(csqc_vidvars_t));
-
 	// if the server is not requesting a csprogs, then we're done here
 	if (requiredcrc < 0)
 		return;
@@ -569,27 +708,32 @@ void CL_VM_Init (void)
 	PRVM_Begin;
 	PRVM_InitProg(PRVM_CLIENTPROG);
 
-	csqc_mempool = Mem_AllocPool("CSQC", 0, NULL);
-
 	// allocate the mempools
 	prog->progs_mempool = Mem_AllocPool(csqc_progname.string, 0, NULL);
 	prog->headercrc = CL_PROGHEADER_CRC;
 	prog->edictprivate_size = 0; // no private struct used
 	prog->name = CL_NAME;
 	prog->num_edicts = 1;
+	prog->max_edicts = 512;
 	prog->limit_edicts = CL_MAX_EDICTS;
-	prog->extensionstring = vm_cl_extensions;
+	prog->reserved_edicts = 0;
+	prog->edictprivate_size = sizeof(edict_engineprivate_t);
+	prog->extensionstring = vm_sv_extensions;
 	prog->builtins = vm_cl_builtins;
 	prog->numbuiltins = vm_cl_numbuiltins;
+	prog->begin_increase_edicts = CL_VM_CB_BeginIncreaseEdicts;
+	prog->end_increase_edicts = CL_VM_CB_EndIncreaseEdicts;
+	prog->init_edict = CL_VM_CB_InitEdict;
+	prog->free_edict = CL_VM_CB_FreeEdict;
+	prog->count_edicts = CL_VM_CB_CountEdicts;
+	prog->load_edict = CL_VM_CB_LoadEdict;
 	prog->init_cmd = VM_CL_Cmd_Init;
 	prog->reset_cmd = VM_CL_Cmd_Reset;
 	prog->error_cmd = CL_VM_Error;
 
-	PRVM_LoadProgs(csqc_progname.string, cl_numrequiredfunc, cl_required_func, 0, NULL);
+	PRVM_LoadProgs(csqc_progname.string, cl_numrequiredfunc, cl_required_func, 0, NULL, 0, NULL);
 
-	if(prog->loaded)
-		Con_Printf("CSQC ^5loaded (crc=%i, size=%i)\n", csprogsdatacrc, (int)csprogsdatasize);
-	else
+	if (!prog->loaded)
 	{
 		CL_VM_Error("CSQC ^2failed to load\n");
 		if(!sv.active)
@@ -597,27 +741,34 @@ void CL_VM_Init (void)
 		return;
 	}
 
-	//[515]: optional fields & funcs
-	CL_VM_FindEdictFieldOffsets();
+	Con_Printf("CSQC ^5loaded (crc=%i, size=%i)\n", csprogsdatacrc, (int)csprogsdatasize);
+
+	// check if OP_STATE animation is possible in this dat file
+	if (prog->fieldoffsets.nextthink >= 0 && prog->fieldoffsets.frame >= 0 && prog->fieldoffsets.think >= 0 && prog->globaloffsets.self >= 0)
+		prog->flag |= PRVM_OP_STATE;
 
 	// set time
-	*prog->time = cl.time;
-	csqc_frametime = 0;
+	prog->globals.client->time = cl.time;
 
 	prog->globals.client->mapname = PRVM_SetEngineString(cl.worldmodel->name);
 	prog->globals.client->player_localentnum = cl.playerentity;
 
+	// set map description (use world entity 0)
+	val = PRVM_EDICTFIELDVALUE(prog->edicts, prog->fieldoffsets.message);
+	if(val)
+		val->string = PRVM_SetEngineString(cl.levelname);
+
 	// call the prog init
-	PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(CL_F_INIT) - prog->functions), CL_F_INIT);
+	PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Init, "QC function CSQC_Init is missing");
 
 	PRVM_End;
-	csqc_loaded = true;
-
-	csqc_sv2csqcents = (unsigned short *)Mem_Alloc(csqc_mempool, MAX_EDICTS*sizeof(unsigned short));
-	memset(csqc_sv2csqcents, 0, MAX_EDICTS*sizeof(unsigned short));
+	cl.csqc_loaded = true;
 
 	cl.csqc_vidvars.drawcrosshair = false;
 	cl.csqc_vidvars.drawenginesbar = false;
+
+	// Update Coop and Deathmatch Globals (at this point the client knows them from ServerInfo)
+	CL_VM_UpdateCoopDeathmatchGlobals(cl.gametype);
 }
 
 void CL_VM_ShutDown (void)
@@ -625,14 +776,14 @@ void CL_VM_ShutDown (void)
 	Cmd_ClearCsqcFuncs();
 	Cvar_SetValueQuick(&csqc_progcrc, -1);
 	Cvar_SetValueQuick(&csqc_progsize, -1);
-	if(!csqc_loaded)
+	if(!cl.csqc_loaded)
 		return;
 	CSQC_BEGIN
-		*prog->time = cl.time;
-		PRVM_ExecuteProgram((func_t) (PRVM_ED_FindFunction(CL_F_SHUTDOWN) - prog->functions), CL_F_SHUTDOWN);
+		prog->globals.client->time = cl.time;
+		if (prog->funcoffsets.CSQC_Shutdown)
+			PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Shutdown, "QC function CSQC_Shutdown is missing");
 		PRVM_ResetProg();
 	CSQC_END
 	Con_Print("CSQC ^1unloaded\n");
-	csqc_loaded = false;
-	Mem_FreePool(&csqc_mempool);
+	cl.csqc_loaded = false;
 }