X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=clvm_cmds.c;h=08bf6c8fdd2710518b9177e25def9d72efd11466;hp=5547057df3f3a5e42246291ae02c928728cfdb87;hb=053e5e3f2137d880aaaa31ca8c5705c7edc15782;hpb=cb16a7014e2bf0080ea13bd228e09a7e9e7e611e

diff --git a/clvm_cmds.c b/clvm_cmds.c
index 5547057d..08bf6c8f 100644
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -1,3 +1,5 @@
+#include "quakedef.h"
+
 #include "prvm_cmds.h"
 #include "csprogs.h"
 #include "cl_collision.h"
@@ -17,17 +19,12 @@
 //4 feature darkplaces csqc: add builtins to clientside qc for gl calls
 
 sfx_t *S_FindName(const char *name);
-int Sbar_GetPlayer (int index);
+int Sbar_GetSortedPlayerIndex (int index);
 void Sbar_SortFrags (void);
 void CL_FindNonSolidLocation(const vec3_t in, vec3_t out, vec_t radius);
 void CSQC_RelinkAllEntities (int drawmask);
 void CSQC_RelinkCSQCEntities (void);
-char *Key_GetBind (int key);
-
-
-
-
-
+const char *Key_GetBind (int key);
 
 // #1 void(vector ang) makevectors
 static void VM_CL_makevectors (void)
@@ -37,7 +34,7 @@ static void VM_CL_makevectors (void)
 }
 
 // #2 void(entity e, vector o) setorigin
-static void VM_CL_setorigin (void)
+void VM_CL_setorigin (void)
 {
 	prvm_edict_t	*e;
 	float	*org;
@@ -59,41 +56,71 @@ static void VM_CL_setorigin (void)
 	CL_LinkEdict(e);
 }
 
+static void SetMinMaxSize (prvm_edict_t *e, float *min, float *max)
+{
+	int		i;
+
+	for (i=0 ; i<3 ; i++)
+		if (min[i] > max[i])
+			PRVM_ERROR("SetMinMaxSize: backwards mins/maxs");
+
+	// set derived values
+	VectorCopy (min, e->fields.client->mins);
+	VectorCopy (max, e->fields.client->maxs);
+	VectorSubtract (max, min, e->fields.client->size);
+
+	CL_LinkEdict (e);
+}
+
 // #3 void(entity e, string m) setmodel
-static void VM_CL_setmodel (void)
+void VM_CL_setmodel (void)
 {
 	prvm_edict_t	*e;
 	const char		*m;
-	struct model_s	*mod;
+	model_t *mod;
 	int				i;
 
 	VM_SAFEPARMCOUNT(2, VM_CL_setmodel);
 
 	e = PRVM_G_EDICT(OFS_PARM0);
+	e->fields.client->modelindex = 0;
+	e->fields.client->model = 0;
+
 	m = PRVM_G_STRING(OFS_PARM1);
+	mod = NULL;
 	for (i = 0;i < MAX_MODELS && cl.csqc_model_precache[i];i++)
 	{
 		if (!strcmp(cl.csqc_model_precache[i]->name, m))
 		{
-			e->fields.client->model = PRVM_SetEngineString(cl.csqc_model_precache[i]->name);
+			mod = cl.csqc_model_precache[i];
+			e->fields.client->model = PRVM_SetEngineString(mod->name);
 			e->fields.client->modelindex = -(i+1);
-			return;
+			break;
 		}
 	}
 
-	for (i = 0;i < MAX_MODELS;i++)
-	{
-		mod = cl.model_precache[i];
-		if (mod && !strcmp(mod->name, m))
+	if( !mod ) {
+		for (i = 0;i < MAX_MODELS;i++)
 		{
-			e->fields.client->model = PRVM_SetEngineString(mod->name);
-			e->fields.client->modelindex = i;
-			return;
+			mod = cl.model_precache[i];
+			if (mod && !strcmp(mod->name, m))
+			{
+				e->fields.client->model = PRVM_SetEngineString(mod->name);
+				e->fields.client->modelindex = i;
+				break;
+			}
 		}
 	}
 
-	e->fields.client->modelindex = 0;
-	e->fields.client->model = 0;
+	if( mod ) {
+		// TODO: check if this breaks needed consistency and maybe add a cvar for it too?? [1/10/2008 Black]
+		//SetMinMaxSize (e, mod->normalmins, mod->normalmaxs);
+	}
+	else
+	{
+		SetMinMaxSize (e, vec3_origin, vec3_origin);
+		VM_Warning ("setmodel: model '%s' not precached\n", m);
+	}
 }
 
 // #4 void(entity e, vector min, vector max) setsize
@@ -117,9 +144,7 @@ static void VM_CL_setsize (void)
 	min = PRVM_G_VECTOR(OFS_PARM1);
 	max = PRVM_G_VECTOR(OFS_PARM2);
 
-	VectorCopy (min, e->fields.client->mins);
-	VectorCopy (max, e->fields.client->maxs);
-	VectorSubtract (max, min, e->fields.client->size);
+	SetMinMaxSize( e, min, max );
 
 	CL_LinkEdict(e);
 }
@@ -198,7 +223,6 @@ static void VM_CL_spawn (void)
 {
 	prvm_edict_t *ed;
 	ed = PRVM_ED_Alloc();
-	ed->fields.client->entnum = PRVM_NUM_FOR_EDICT(ed);	//[515]: not needed any more ?
 	VM_RETURN_EDICT(ed);
 }
 
@@ -210,7 +234,7 @@ static void VM_CL_traceline (void)
 	int		move;
 	prvm_edict_t	*ent;
 
-	VM_SAFEPARMCOUNTRANGE(4, 8, VM_CL_traceline); // allow more parameters for future expansion
+	VM_SAFEPARMCOUNTRANGE(4, 4, VM_CL_traceline);
 
 	prog->xfunction->builtinsprofile += 30;
 
@@ -335,7 +359,7 @@ static void VM_CL_tracetoss (void)
 
 
 // #20 void(string s) precache_model
-static void VM_CL_precache_model (void)
+void VM_CL_precache_model (void)
 {
 	const char	*name;
 	int			i;
@@ -344,7 +368,7 @@ static void VM_CL_precache_model (void)
 	VM_SAFEPARMCOUNT(1, VM_CL_precache_model);
 
 	name = PRVM_G_STRING(OFS_PARM0);
-	for (i = 1;i < MAX_MODELS && cl.csqc_model_precache[i];i++)
+	for (i = 0;i < MAX_MODELS && cl.csqc_model_precache[i];i++)
 	{
 		if(!strcmp(cl.csqc_model_precache[i]->name, name))
 		{
@@ -356,7 +380,7 @@ static void VM_CL_precache_model (void)
 	m = Mod_ForName(name, false, false, false);
 	if(m && m->loaded)
 	{
-		for (i = 1;i < MAX_MODELS;i++)
+		for (i = 0;i < MAX_MODELS;i++)
 		{
 			if (!cl.csqc_model_precache[i])
 			{
@@ -637,33 +661,34 @@ extern qboolean CSQC_AddRenderEdict (prvm_edict_t *ed);//csprogs.c
 static void CSQC_R_RecalcView (void)
 {
 	extern matrix4x4_t viewmodelmatrix;
-	Matrix4x4_CreateFromQuakeEntity(&r_view.matrix, cl.csqc_origin[0], cl.csqc_origin[1], cl.csqc_origin[2], cl.csqc_angles[0], cl.csqc_angles[1], cl.csqc_angles[2], 1);
+	Matrix4x4_CreateFromQuakeEntity(&r_refdef.view.matrix, cl.csqc_origin[0], cl.csqc_origin[1], cl.csqc_origin[2], cl.csqc_angles[0], cl.csqc_angles[1], cl.csqc_angles[2], 1);
 	Matrix4x4_CreateFromQuakeEntity(&viewmodelmatrix, cl.csqc_origin[0], cl.csqc_origin[1], cl.csqc_origin[2], cl.csqc_angles[0], cl.csqc_angles[1], cl.csqc_angles[2], cl_viewmodel_scale.value);
 }
 
 void CL_RelinkLightFlashes(void);
 //#300 void() clearscene (EXT_CSQC)
-static void VM_CL_R_ClearScene (void)
+void VM_CL_R_ClearScene (void)
 {
 	VM_SAFEPARMCOUNT(0, VM_CL_R_ClearScene);
 	// clear renderable entity and light lists
-	r_refdef.numentities = 0;
-	r_refdef.numlights = 0;
+	r_refdef.scene.numentities = 0;
+	r_refdef.scene.numlights = 0;
 	// FIXME: restore these to the values from VM_CL_UpdateView
-	r_view.x = 0;
-	r_view.y = 0;
-	r_view.z = 0;
-	r_view.width = vid.width;
-	r_view.height = vid.height;
-	r_view.depth = 1;
+	r_refdef.view.x = 0;
+	r_refdef.view.y = 0;
+	r_refdef.view.z = 0;
+	r_refdef.view.width = vid.width;
+	r_refdef.view.height = vid.height;
+	r_refdef.view.depth = 1;
 	// FIXME: restore frustum_x/frustum_y
-	r_view.useperspective = true;
-	r_view.frustum_y = tan(scr_fov.value * M_PI / 360.0) * (3.0/4.0) * cl.viewzoom;
-	r_view.frustum_x = r_view.frustum_y * (float)r_view.width / (float)r_view.height / vid_pixelheight.value;
-	r_view.frustum_x *= r_refdef.frustumscale_x;
-	r_view.frustum_y *= r_refdef.frustumscale_y;
-	r_view.ortho_x = scr_fov.value * (3.0 / 4.0) * (float)r_view.width / (float)r_view.height / vid_pixelheight.value;
-	r_view.ortho_y = scr_fov.value * (3.0 / 4.0);
+	r_refdef.view.useperspective = true;
+	r_refdef.view.frustum_y = tan(scr_fov.value * M_PI / 360.0) * (3.0/4.0) * cl.viewzoom;
+	r_refdef.view.frustum_x = r_refdef.view.frustum_y * (float)r_refdef.view.width / (float)r_refdef.view.height / vid_pixelheight.value;
+	r_refdef.view.frustum_x *= r_refdef.frustumscale_x;
+	r_refdef.view.frustum_y *= r_refdef.frustumscale_y;
+	r_refdef.view.ortho_x = scr_fov.value * (3.0 / 4.0) * (float)r_refdef.view.width / (float)r_refdef.view.height / vid_pixelheight.value;
+	r_refdef.view.ortho_y = scr_fov.value * (3.0 / 4.0);
+	r_refdef.view.clear = true;
 	// FIXME: restore cl.csqc_origin
 	// FIXME: restore cl.csqc_angles
 	cl.csqc_vidvars.drawworld = true;
@@ -674,7 +699,7 @@ static void VM_CL_R_ClearScene (void)
 //#301 void(float mask) addentities (EXT_CSQC)
 extern void CSQC_Predraw (prvm_edict_t *ed);//csprogs.c
 extern void CSQC_Think (prvm_edict_t *ed);//csprogs.c
-static void VM_CL_R_AddEntities (void)
+void VM_CL_R_AddEntities (void)
 {
 	int			i, drawmask;
 	prvm_edict_t *ed;
@@ -703,14 +728,14 @@ static void VM_CL_R_AddEntities (void)
 }
 
 //#302 void(entity ent) addentity (EXT_CSQC)
-static void VM_CL_R_AddEntity (void)
+void VM_CL_R_AddEntity (void)
 {
 	VM_SAFEPARMCOUNT(1, VM_CL_R_AddEntity);
 	CSQC_AddRenderEdict(PRVM_G_EDICT(OFS_PARM0));
 }
 
 //#303 float(float property, ...) setproperty (EXT_CSQC)
-static void VM_CL_R_SetView (void)
+void VM_CL_R_SetView (void)
 {
 	int		c;
 	float	*f;
@@ -724,109 +749,125 @@ static void VM_CL_R_SetView (void)
 
 	switch(c)
 	{
-	case VF_MIN:			r_view.x = (int)(f[0] * vid.width / vid_conwidth.value);
-							r_view.y = (int)(f[1] * vid.height / vid_conheight.value);
-							break;
-	case VF_MIN_X:			r_view.x = (int)(k * vid.width / vid_conwidth.value);
-							break;
-	case VF_MIN_Y:			r_view.y = (int)(k * vid.height / vid_conheight.value);
-							break;
-	case VF_SIZE:			r_view.width = (int)(f[0] * vid.width / vid_conwidth.value);
-							r_view.height = (int)(f[1] * vid.height / vid_conheight.value);
-							break;
-	case VF_SIZE_Y:			r_view.width = (int)(k * vid.width / vid_conwidth.value);
-							break;
-	case VF_SIZE_X:			r_view.height = (int)(k * vid.height / vid_conheight.value);
-							break;
-	case VF_VIEWPORT:		r_view.x = (int)(f[0] * vid.width / vid_conwidth.value);
-							r_view.y = (int)(f[1] * vid.height / vid_conheight.value);
-							f = PRVM_G_VECTOR(OFS_PARM2);
-							r_view.width = (int)(f[0] * vid.width / vid_conwidth.value);
-							r_view.height = (int)(f[1] * vid.height / vid_conheight.value);
-							break;
-	case VF_FOV:			r_view.frustum_x = tan(f[0] * M_PI / 360.0);r_view.ortho_x = f[0];
-							r_view.frustum_y = tan(f[1] * M_PI / 360.0);r_view.ortho_y = f[1];
-							break;
-	case VF_FOVX:			r_view.frustum_x = tan(k * M_PI / 360.0);r_view.ortho_x = k;
-							break;
-	case VF_FOVY:			r_view.frustum_y = tan(k * M_PI / 360.0);r_view.ortho_y = k;
-							break;
-	case VF_ORIGIN:			VectorCopy(f, cl.csqc_origin);
-							CSQC_R_RecalcView();
-							break;
-	case VF_ORIGIN_X:		cl.csqc_origin[0] = k;
-							CSQC_R_RecalcView();
-							break;
-	case VF_ORIGIN_Y:		cl.csqc_origin[1] = k;
-							CSQC_R_RecalcView();
-							break;
-	case VF_ORIGIN_Z:		cl.csqc_origin[2] = k;
-							CSQC_R_RecalcView();
-							break;
-	case VF_ANGLES:			VectorCopy(f, cl.csqc_angles);
-							CSQC_R_RecalcView();
-							break;
-	case VF_ANGLES_X:		cl.csqc_angles[0] = k;
-							CSQC_R_RecalcView();
-							break;
-	case VF_ANGLES_Y:		cl.csqc_angles[1] = k;
-							CSQC_R_RecalcView();
-							break;
-	case VF_ANGLES_Z:		cl.csqc_angles[2] = k;
-							CSQC_R_RecalcView();
-							break;
-	case VF_DRAWWORLD:		cl.csqc_vidvars.drawworld = k;
-							break;
-	case VF_DRAWENGINESBAR:	cl.csqc_vidvars.drawenginesbar = k;
-							break;
-	case VF_DRAWCROSSHAIR:	cl.csqc_vidvars.drawcrosshair = k;
-							break;
-
-	case VF_CL_VIEWANGLES:	VectorCopy(f, cl.viewangles);
-							break;
-	case VF_CL_VIEWANGLES_X:cl.viewangles[0] = k;
-							break;
-	case VF_CL_VIEWANGLES_Y:cl.viewangles[1] = k;
-							break;
-	case VF_CL_VIEWANGLES_Z:cl.viewangles[2] = k;
-							break;
-
-	case VF_PERSPECTIVE:	r_view.useperspective = k != 0;
-							break;
-
-	default:				PRVM_G_FLOAT(OFS_RETURN) = 0;
-							VM_Warning("VM_CL_R_SetView : unknown parm %i\n", c);
-							return;
+	case VF_MIN:
+		r_refdef.view.x = (int)(f[0] * vid.width / vid_conwidth.value);
+		r_refdef.view.y = (int)(f[1] * vid.height / vid_conheight.value);
+		break;
+	case VF_MIN_X:
+		r_refdef.view.x = (int)(k * vid.width / vid_conwidth.value);
+		break;
+	case VF_MIN_Y:
+		r_refdef.view.y = (int)(k * vid.height / vid_conheight.value);
+		break;
+	case VF_SIZE:
+		r_refdef.view.width = (int)(f[0] * vid.width / vid_conwidth.value);
+		r_refdef.view.height = (int)(f[1] * vid.height / vid_conheight.value);
+		break;
+	case VF_SIZE_Y:
+		r_refdef.view.width = (int)(k * vid.width / vid_conwidth.value);
+		break;
+	case VF_SIZE_X:
+		r_refdef.view.height = (int)(k * vid.height / vid_conheight.value);
+		break;
+	case VF_VIEWPORT:
+		r_refdef.view.x = (int)(f[0] * vid.width / vid_conwidth.value);
+		r_refdef.view.y = (int)(f[1] * vid.height / vid_conheight.value);
+		f = PRVM_G_VECTOR(OFS_PARM2);
+		r_refdef.view.width = (int)(f[0] * vid.width / vid_conwidth.value);
+		r_refdef.view.height = (int)(f[1] * vid.height / vid_conheight.value);
+		break;
+	case VF_FOV:
+		r_refdef.view.frustum_x = tan(f[0] * M_PI / 360.0);r_refdef.view.ortho_x = f[0];
+		r_refdef.view.frustum_y = tan(f[1] * M_PI / 360.0);r_refdef.view.ortho_y = f[1];
+		break;
+	case VF_FOVX:
+		r_refdef.view.frustum_x = tan(k * M_PI / 360.0);r_refdef.view.ortho_x = k;
+		break;
+	case VF_FOVY:
+		r_refdef.view.frustum_y = tan(k * M_PI / 360.0);r_refdef.view.ortho_y = k;
+		break;
+	case VF_ORIGIN:
+		VectorCopy(f, cl.csqc_origin);
+		CSQC_R_RecalcView();
+		break;
+	case VF_ORIGIN_X:
+		cl.csqc_origin[0] = k;
+		CSQC_R_RecalcView();
+		break;
+	case VF_ORIGIN_Y:
+		cl.csqc_origin[1] = k;
+		CSQC_R_RecalcView();
+		break;
+	case VF_ORIGIN_Z:
+		cl.csqc_origin[2] = k;
+		CSQC_R_RecalcView();
+		break;
+	case VF_ANGLES:
+		VectorCopy(f, cl.csqc_angles);
+		CSQC_R_RecalcView();
+		break;
+	case VF_ANGLES_X:
+		cl.csqc_angles[0] = k;
+		CSQC_R_RecalcView();
+		break;
+	case VF_ANGLES_Y:
+		cl.csqc_angles[1] = k;
+		CSQC_R_RecalcView();
+		break;
+	case VF_ANGLES_Z:
+		cl.csqc_angles[2] = k;
+		CSQC_R_RecalcView();
+		break;
+	case VF_DRAWWORLD:
+		cl.csqc_vidvars.drawworld = k;
+		break;
+	case VF_DRAWENGINESBAR:
+		cl.csqc_vidvars.drawenginesbar = k;
+		break;
+	case VF_DRAWCROSSHAIR:
+		cl.csqc_vidvars.drawcrosshair = k;
+		break;
+	case VF_CL_VIEWANGLES:
+		VectorCopy(f, cl.viewangles);
+		break;
+	case VF_CL_VIEWANGLES_X:
+		cl.viewangles[0] = k;
+		break;
+	case VF_CL_VIEWANGLES_Y:
+		cl.viewangles[1] = k;
+		break;
+	case VF_CL_VIEWANGLES_Z:
+		cl.viewangles[2] = k;
+		break;
+	case VF_PERSPECTIVE:
+		r_refdef.view.useperspective = k != 0;
+		break;
+	case VF_CLEARSCREEN:
+		r_refdef.view.clear = k ? true : false;
+		break;
+	default:
+		PRVM_G_FLOAT(OFS_RETURN) = 0;
+		VM_Warning("VM_CL_R_SetView : unknown parm %i\n", c);
+		return;
 	}
 	PRVM_G_FLOAT(OFS_RETURN) = 1;
 }
 
-//#304 void() renderscene (EXT_CSQC)
-static void VM_CL_R_RenderScene (void)
-{
-	VM_SAFEPARMCOUNT(0, VM_CL_R_RenderScene);
-	// we need to update any RENDER_VIEWMODEL entities at this point because
-	// csqc supplies its own view matrix
-	CL_UpdateViewEntities();
-	// now draw stuff!
-	R_RenderView();
-}
-
 //#305 void(vector org, float radius, vector lightcolours) adddynamiclight (EXT_CSQC)
-static void VM_CL_R_AddDynamicLight (void)
+void VM_CL_R_AddDynamicLight (void)
 {
 	float		*pos, *col;
 	matrix4x4_t	matrix;
-	VM_SAFEPARMCOUNTRANGE(3, 8, VM_CL_R_AddDynamicLight); // allow more than 3 because we may extend this in the future
+	VM_SAFEPARMCOUNTRANGE(3, 3, VM_CL_R_AddDynamicLight);
 
 	// if we've run out of dlights, just return
-	if (r_refdef.numlights >= MAX_DLIGHTS)
+	if (r_refdef.scene.numlights >= MAX_DLIGHTS)
 		return;
 
 	pos = PRVM_G_VECTOR(OFS_PARM0);
 	col = PRVM_G_VECTOR(OFS_PARM2);
 	Matrix4x4_CreateFromQuakeEntity(&matrix, pos[0], pos[1], pos[2], 0, 0, 0, PRVM_G_FLOAT(OFS_PARM1));
-	R_RTLight_Update(&r_refdef.lights[r_refdef.numlights++], false, &matrix, col, -1, NULL, true, 1, 0.25, 0, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+	R_RTLight_Update(&r_refdef.scene.lights[r_refdef.scene.numlights++], false, &matrix, col, -1, NULL, true, 1, 0.25, 0, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
 }
 
 //============================================================================
@@ -839,8 +880,8 @@ static void VM_CL_unproject (void)
 
 	VM_SAFEPARMCOUNT(1, VM_CL_unproject);
 	f = PRVM_G_VECTOR(OFS_PARM0);
-	VectorSet(temp, f[2], f[0] * f[2] * -r_view.frustum_x * 2.0 / r_view.width, f[1] * f[2] * -r_view.frustum_y * 2.0 / r_view.height);
-	Matrix4x4_Transform(&r_view.matrix, temp, PRVM_G_VECTOR(OFS_RETURN));
+	VectorSet(temp, f[2], f[0] * f[2] * -r_refdef.view.frustum_x * 2.0 / r_refdef.view.width, f[1] * f[2] * -r_refdef.view.frustum_y * 2.0 / r_refdef.view.height);
+	Matrix4x4_Transform(&r_refdef.view.matrix, temp, PRVM_G_VECTOR(OFS_RETURN));
 }
 
 //#311 vector (vector v) cs_project (EXT_CSQC)
@@ -852,9 +893,9 @@ static void VM_CL_project (void)
 
 	VM_SAFEPARMCOUNT(1, VM_CL_project);
 	f = PRVM_G_VECTOR(OFS_PARM0);
-	Matrix4x4_Invert_Simple(&m, &r_view.matrix);
+	Matrix4x4_Invert_Simple(&m, &r_refdef.view.matrix);
 	Matrix4x4_Transform(&m, f, v);
-	VectorSet(PRVM_G_VECTOR(OFS_RETURN), v[1]/v[0]/-r_view.frustum_x*0.5*r_view.width, v[2]/v[0]/-r_view.frustum_y*r_view.height*0.5, v[0]);
+	VectorSet(PRVM_G_VECTOR(OFS_RETURN), v[1]/v[0]/-r_refdef.view.frustum_x*0.5*r_refdef.view.width, v[2]/v[0]/-r_refdef.view.frustum_y*r_refdef.view.height*0.5, v[0]);
 }
 
 //#330 float(float stnum) getstatf (EXT_CSQC)
@@ -955,6 +996,14 @@ static void VM_CL_setmodelindex (void)
 	}
 	t->fields.client->model = PRVM_SetEngineString(model->name);
 	t->fields.client->modelindex = i;
+
+	// TODO: check if this breaks needed consistency and maybe add a cvar for it too?? [1/10/2008 Black]
+	if (model)
+	{
+		SetMinMaxSize (t, model->normalmins, model->normalmaxs);
+	}
+	else
+		SetMinMaxSize (t, vec3_origin, vec3_origin);
 }
 
 //#334 string(float mdlindex) modelnameforindex (EXT_CSQC)
@@ -1021,7 +1070,7 @@ static void VM_CL_setcursormode (void)
 {
 	VM_SAFEPARMCOUNT(1, VM_CL_setcursormode);
 	cl.csqc_wantsmousemove = PRVM_G_FLOAT(OFS_PARM0);
-	cl_ignoremousemove = true;
+	cl_ignoremousemoves = 2;
 }
 
 //#345 float(float framenum) getinputstate (EXT_CSQC)
@@ -1076,8 +1125,9 @@ static void VM_CL_getplayerkey (void)
 	PRVM_G_INT(OFS_RETURN) = OFS_NULL;
 	Sbar_SortFrags();
 
-	i = Sbar_GetPlayer(i);
-	if(i < 0)
+	if (i < 0)
+		i = Sbar_GetSortedPlayerIndex(-1-i);
+	if(i < 0 || i >= cl.maxclients)
 		return;
 
 	t[0] = 0;
@@ -1230,12 +1280,12 @@ static void VM_CL_makestatic (void)
 		entity_t *staticent = &cl.static_entities[cl.num_static_entities++];
 
 		// copy it to the current state
+		memset(staticent, 0, sizeof(*staticent));
 		staticent->render.model = CL_GetModelByIndex((int)ent->fields.client->modelindex);
 		staticent->render.frame1 = staticent->render.frame2 = (int)ent->fields.client->frame;
 		staticent->render.framelerp = 0;
 		// make torchs play out of sync
 		staticent->render.frame1time = staticent->render.frame2time = lhrandom(-10, -1);
-		staticent->render.colormap = (int)ent->fields.client->colormap; // no special coloring
 		staticent->render.skinnum = (int)ent->fields.client->skin;
 		staticent->render.effects = (int)ent->fields.client->effects;
 		staticent->render.alpha = 1;
@@ -1255,7 +1305,6 @@ static void VM_CL_makestatic (void)
 		}
 		else
 			Matrix4x4_CreateFromQuakeEntity(&staticent->render.matrix, ent->fields.client->origin[0], ent->fields.client->origin[1], ent->fields.client->origin[2], ent->fields.client->angles[0], ent->fields.client->angles[1], ent->fields.client->angles[2], staticent->render.scale);
-		CL_UpdateRenderEntity(&staticent->render);
 
 		// either fullbright or lit
 		if (!(staticent->render.effects & EF_FULLBRIGHT) && !r_fullbright.integer)
@@ -1263,6 +1312,8 @@ static void VM_CL_makestatic (void)
 		// turn off shadows from transparent objects
 		if (!(staticent->render.effects & (EF_NOSHADOW | EF_ADDITIVE | EF_NODEPTHTEST)) && (staticent->render.alpha >= 1))
 			staticent->render.flags |= RENDER_SHADOW;
+
+		CL_UpdateRenderEntity(&staticent->render);
 	}
 	else
 		Con_Printf("Too many static entities");
@@ -1652,7 +1703,7 @@ static void VM_CL_te_explosion2 (void)
 	colorLength = (int)PRVM_G_FLOAT(OFS_PARM2);
 	CL_FindNonSolidLocation(pos, pos2, 10);
 	CL_ParticleExplosion2(pos2, colorStart, colorLength);
-	tempcolor = (unsigned char *)&palette_complete[(rand()%colorLength) + colorStart];
+	tempcolor = palette_rgb[(rand()%colorLength) + colorStart];
 	color[0] = tempcolor[0] * (2.0f / 255.0f);
 	color[1] = tempcolor[1] * (2.0f / 255.0f);
 	color[2] = tempcolor[2] * (2.0f / 255.0f);
@@ -1764,7 +1815,81 @@ static void VM_CL_getsurfacepoint(void)
 	// FIXME: implement rotation/scaling
 	VectorAdd(&(model->surfmesh.data_vertex3f + 3 * surface->num_firstvertex)[pointnum * 3], ed->fields.client->origin, PRVM_G_VECTOR(OFS_RETURN));
 }
+//PF_getsurfacepointattribute,     // #486 vector(entity e, float s, float n, float a) getsurfacepointattribute = #486;
+// float SPA_POSITION = 0;
+// float SPA_S_AXIS = 1;
+// float SPA_T_AXIS = 2;
+// float SPA_R_AXIS = 3; // same as SPA_NORMAL
+// float SPA_TEXCOORDS0 = 4;
+// float SPA_LIGHTMAP0_TEXCOORDS = 5;
+// float SPA_LIGHTMAP0_COLOR = 6;
+// TODO: add some wrapper code and merge VM_CL/SV_getsurface* [12/16/2007 Black]
+static void VM_CL_getsurfacepointattribute(void)
+{
+	prvm_edict_t *ed;
+	model_t *model;
+	msurface_t *surface;
+	int pointnum;
+	int attributetype;
 
+	VM_SAFEPARMCOUNT(4, VM_CL_getsurfacenumpoints);
+	VectorClear(PRVM_G_VECTOR(OFS_RETURN));
+	ed = PRVM_G_EDICT(OFS_PARM0);
+	if (!(model = CL_GetModelFromEdict(ed)) || !(surface = cl_getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
+		return;
+	// note: this (incorrectly) assumes it is a simple polygon
+	pointnum = (int)PRVM_G_FLOAT(OFS_PARM2);
+	if (pointnum < 0 || pointnum >= surface->num_vertices)
+		return;
+
+	// FIXME: implement rotation/scaling
+	attributetype = (int) PRVM_G_FLOAT(OFS_PARM3);
+
+	switch( attributetype ) {
+		// float SPA_POSITION = 0;
+		case 0:
+			VectorAdd(&(model->surfmesh.data_vertex3f + 3 * surface->num_firstvertex)[pointnum * 3], ed->fields.client->origin, PRVM_G_VECTOR(OFS_RETURN));
+			break;
+		// float SPA_S_AXIS = 1;
+		case 1:
+			VectorCopy(&(model->surfmesh.data_svector3f + 3 * surface->num_firstvertex)[pointnum * 3], PRVM_G_VECTOR(OFS_RETURN));
+			break;
+		// float SPA_T_AXIS = 2;
+		case 2:
+			VectorCopy(&(model->surfmesh.data_tvector3f + 3 * surface->num_firstvertex)[pointnum * 3], PRVM_G_VECTOR(OFS_RETURN));
+			break;
+		// float SPA_R_AXIS = 3; // same as SPA_NORMAL
+		case 3:
+			VectorCopy(&(model->surfmesh.data_normal3f + 3 * surface->num_firstvertex)[pointnum * 3], PRVM_G_VECTOR(OFS_RETURN));
+			break;
+		// float SPA_TEXCOORDS0 = 4;
+		case 4: {
+			float *ret = PRVM_G_VECTOR(OFS_RETURN);
+			float *texcoord = &(model->surfmesh.data_texcoordtexture2f + 2 * surface->num_firstvertex)[pointnum * 2];
+			ret[0] = texcoord[0];
+			ret[1] = texcoord[1];
+			ret[2] = 0.0f;
+			break;
+		}
+		// float SPA_LIGHTMAP0_TEXCOORDS = 5;
+		case 5: {
+			float *ret = PRVM_G_VECTOR(OFS_RETURN);
+			float *texcoord = &(model->surfmesh.data_texcoordlightmap2f + 2 * surface->num_firstvertex)[pointnum * 2];
+			ret[0] = texcoord[0];
+			ret[1] = texcoord[1];
+			ret[2] = 0.0f;
+			break;
+		}
+		// float SPA_LIGHTMAP0_COLOR = 6;
+		case 6:
+			// ignore alpha for now..
+			VectorCopy( &(model->surfmesh.data_lightmapcolor4f + 4 * surface->num_firstvertex)[pointnum * 4], PRVM_G_VECTOR(OFS_RETURN));
+			break;
+		default:
+			VectorSet( PRVM_G_VECTOR(OFS_RETURN), 0.0f, 0.0f, 0.0f );
+			break;
+	}
+}
 // #436 vector(entity e, float s) getsurfacenormal
 static void VM_CL_getsurfacenormal(void)
 {
@@ -1862,7 +1987,7 @@ static void VM_CL_getsurfaceclippedpoint(void)
 }
 
 // #443 void(entity e, entity tagentity, string tagname) setattachment
-static void VM_CL_setattachment (void)
+void VM_CL_setattachment (void)
 {
 	prvm_edict_t *e;
 	prvm_edict_t *tagentity;
@@ -1941,6 +2066,7 @@ int CL_GetTagMatrix (matrix4x4_t *out, prvm_edict_t *ent, int tagindex)
 	matrix4x4_t entitymatrix, tagmatrix, attachmatrix;
 	prvm_edict_t *attachent;
 	model_t *model;
+	float scale;
 
 	*out = identitymatrix; // warnings and errors return identical matrix
 
@@ -1985,10 +2111,11 @@ int CL_GetTagMatrix (matrix4x4_t *out, prvm_edict_t *ent, int tagindex)
 				attachmatrix = identitymatrix;
 
 			// apply transformation by child entity matrix
+			scale = 1;
 			val = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.scale);
-			if (val->_float == 0)
-				val->_float = 1;
-			Matrix4x4_CreateFromQuakeEntity(&entitymatrix, ent->fields.client->origin[0], ent->fields.client->origin[1], ent->fields.client->origin[2], -ent->fields.client->angles[0], ent->fields.client->angles[1], ent->fields.client->angles[2], val->_float);
+			if (val && val->_float != 0)
+				scale = val->_float;
+			Matrix4x4_CreateFromQuakeEntity(&entitymatrix, ent->fields.client->origin[0], ent->fields.client->origin[1], ent->fields.client->origin[2], -ent->fields.client->angles[0], ent->fields.client->angles[1], ent->fields.client->angles[2], scale);
 			Matrix4x4_Concat(out, &entitymatrix, &tagmatrix);
 			Matrix4x4_Copy(&tagmatrix, out);
 
@@ -2005,22 +2132,24 @@ int CL_GetTagMatrix (matrix4x4_t *out, prvm_edict_t *ent, int tagindex)
 	}
 
 	// normal or RENDER_VIEWMODEL entity (or main parent entity on attach chain)
+	scale = 1;
 	val = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.scale);
-	if (val->_float == 0)
-		val->_float = 1;
+	if (val && val->_float != 0)
+		scale = val->_float;
 	// Alias models have inverse pitch, bmodels can't have tags, so don't check for modeltype...
-	Matrix4x4_CreateFromQuakeEntity(&entitymatrix, ent->fields.client->origin[0], ent->fields.client->origin[1], ent->fields.client->origin[2], -ent->fields.client->angles[0], ent->fields.client->angles[1], ent->fields.client->angles[2], val->_float);
+	Matrix4x4_CreateFromQuakeEntity(&entitymatrix, ent->fields.client->origin[0], ent->fields.client->origin[1], ent->fields.client->origin[2], -ent->fields.client->angles[0], ent->fields.client->angles[1], ent->fields.client->angles[2], scale);
 	Matrix4x4_Concat(out, &entitymatrix, &tagmatrix);
 
 	if ((val = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.renderflags)) && (RF_VIEWMODEL & (int)val->_float))
 	{// RENDER_VIEWMODEL magic
 		Matrix4x4_Copy(&tagmatrix, out);
 
+		scale = 1;
 		val = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.scale);
-		if (val->_float == 0)
-			val->_float = 1;
+		if (val && val->_float != 0)
+			scale = val->_float;
 
-		Matrix4x4_CreateFromQuakeEntity(&entitymatrix, cl.csqc_origin[0], cl.csqc_origin[1], cl.csqc_origin[2], cl.csqc_angles[0], cl.csqc_angles[1], cl.csqc_angles[2], val->_float);
+		Matrix4x4_CreateFromQuakeEntity(&entitymatrix, cl.csqc_origin[0], cl.csqc_origin[1], cl.csqc_origin[2], cl.csqc_angles[0], cl.csqc_angles[1], cl.csqc_angles[2], scale);
 		Matrix4x4_Concat(out, &entitymatrix, &tagmatrix);
 
 		/*
@@ -2050,7 +2179,7 @@ int CL_GetTagMatrix (matrix4x4_t *out, prvm_edict_t *ent, int tagindex)
 }
 
 // #451 float(entity ent, string tagname) gettagindex (DP_QC_GETTAGINFO)
-static void VM_CL_gettagindex (void)
+void VM_CL_gettagindex (void)
 {
 	prvm_edict_t *ent;
 	const char *tag_name;
@@ -2072,10 +2201,8 @@ static void VM_CL_gettagindex (void)
 	}
 
 	modelindex = (int)ent->fields.client->modelindex;
-	if(modelindex < 0)
-		modelindex = -(modelindex+1);
 	tag_index = 0;
-	if (modelindex <= 0 || modelindex >= MAX_MODELS)
+	if (modelindex >= MAX_MODELS || (modelindex <= -MAX_MODELS /* client models */))
 		Con_DPrintf("gettagindex(entity #%i): null or non-precached model\n", PRVM_NUM_FOR_EDICT(ent));
 	else
 	{
@@ -2087,7 +2214,7 @@ static void VM_CL_gettagindex (void)
 }
 
 // #452 vector(entity ent, float tagindex) gettaginfo (DP_QC_GETTAGINFO)
-static void VM_CL_gettaginfo (void)
+void VM_CL_gettaginfo (void)
 {
 	prvm_edict_t *e;
 	int tagindex;
@@ -2127,358 +2254,337 @@ static void VM_CL_gettaginfo (void)
 //QC POLYGON functions
 //====================
 
-typedef struct
+#define VMPOLYGONS_MAXPOINTS 64
+
+typedef struct vmpolygons_triangle_s
+{
+	rtexture_t		*texture;
+	int				drawflag;
+	int				element3i[3];
+}vmpolygons_triangle_t;
+
+typedef struct vmpolygons_s
 {
-	rtexture_t		*tex;
-	float			data[36];	//[515]: enough for polygons
-	unsigned char			flags;	//[515]: + VM_POLYGON_2D and VM_POLYGON_FL4V flags
-}vm_polygon_t;
+	mempool_t		*pool;
+	qboolean		initialized;
+
+	int				max_vertices;
+	int				num_vertices;
+	float			*data_vertex3f;
+	float			*data_color4f;
+	float			*data_texcoord2f;
+
+	int				max_triangles;
+	int				num_triangles;
+	vmpolygons_triangle_t *data_triangles;
+	int				*data_sortedelement3i;
 
-//static float			vm_polygon_linewidth = 1;
-static mempool_t		*vm_polygons_pool = NULL;
-static unsigned char			vm_current_vertices = 0;
-static qboolean			vm_polygons_initialized = false;
-static vm_polygon_t		*vm_polygons = NULL;
-static unsigned long	vm_polygons_num = 0, vm_drawpolygons_num = 0;	//[515]: ok long on 64bit ?
-static qboolean			vm_polygonbegin = false;	//[515]: for "no-crap-on-the-screen" check
-#define VM_DEFPOLYNUM 64	//[515]: enough for default ?
+	qboolean		begin_active;
+	rtexture_t		*begin_texture;
+	int				begin_drawflag;
+	int				begin_vertices;
+	float			begin_vertex[VMPOLYGONS_MAXPOINTS][3];
+	float			begin_color[VMPOLYGONS_MAXPOINTS][4];
+	float			begin_texcoord[VMPOLYGONS_MAXPOINTS][2];
+} vmpolygons_t;
 
-#define VM_POLYGON_FL3V		16	//more than 2 vertices (used only for lines)
-#define VM_POLYGON_FLLINES	32
-#define VM_POLYGON_FL2D		64
-#define VM_POLYGON_FL4V		128	//4 vertices
+// FIXME: make VM_CL_R_Polygon functions use Debug_Polygon functions?
+vmpolygons_t vmpolygons[PRVM_MAXPROGS];
 
-static void VM_InitPolygons (void)
+//#304 void() renderscene (EXT_CSQC)
+// moved that here to reset the polygons,
+// resetting them earlier causes R_Mesh_Draw to be called with numvertices = 0
+// --blub
+void VM_CL_R_RenderScene (void)
 {
-	vm_polygons_pool = Mem_AllocPool("VMPOLY", 0, NULL);
-	vm_polygons = (vm_polygon_t *)Mem_Alloc(vm_polygons_pool, VM_DEFPOLYNUM*sizeof(vm_polygon_t));
-	memset(vm_polygons, 0, VM_DEFPOLYNUM*sizeof(vm_polygon_t));
-	vm_polygons_num = VM_DEFPOLYNUM;
-	vm_drawpolygons_num = 0;
-	vm_polygonbegin = false;
-	vm_polygons_initialized = true;
+	vmpolygons_t* polys = vmpolygons + PRVM_GetProgNr();
+	VM_SAFEPARMCOUNT(0, VM_CL_R_RenderScene);
+	// we need to update any RENDER_VIEWMODEL entities at this point because
+	// csqc supplies its own view matrix
+	CL_UpdateViewEntities();
+	// now draw stuff!
+	R_RenderView();
+	
+	polys->num_vertices = polys->num_triangles = 0;
 }
 
-static void VM_DrawPolygonCallback (const entity_render_t *ent, const rtlight_t *rtlight, int numsurfaces, int *surfacelist)
+static void VM_ResizePolygons(vmpolygons_t *polys)
 {
-	int surfacelistindex;
-	// LordHavoc: FIXME: this is stupid code
-	for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
+	float *oldvertex3f = polys->data_vertex3f;
+	float *oldcolor4f = polys->data_color4f;
+	float *oldtexcoord2f = polys->data_texcoord2f;
+	vmpolygons_triangle_t *oldtriangles = polys->data_triangles;
+	int *oldsortedelement3i = polys->data_sortedelement3i;
+	polys->max_vertices = polys->max_triangles*3;
+	polys->data_vertex3f = (float *)Mem_Alloc(polys->pool, polys->max_vertices*sizeof(float[3]));
+	polys->data_color4f = (float *)Mem_Alloc(polys->pool, polys->max_vertices*sizeof(float[4]));
+	polys->data_texcoord2f = (float *)Mem_Alloc(polys->pool, polys->max_vertices*sizeof(float[2]));
+	polys->data_triangles = (vmpolygons_triangle_t *)Mem_Alloc(polys->pool, polys->max_triangles*sizeof(vmpolygons_triangle_t));
+	polys->data_sortedelement3i = (int *)Mem_Alloc(polys->pool, polys->max_triangles*sizeof(int[3]));
+	if (polys->num_vertices)
+	{
+		memcpy(polys->data_vertex3f, oldvertex3f, polys->num_vertices*sizeof(float[3]));
+		memcpy(polys->data_color4f, oldcolor4f, polys->num_vertices*sizeof(float[4]));
+		memcpy(polys->data_texcoord2f, oldtexcoord2f, polys->num_vertices*sizeof(float[2]));
+	}
+	if (polys->num_triangles)
 	{
-		const vm_polygon_t	*p = &vm_polygons[surfacelist[surfacelistindex]];
-		int					flags = p->flags & 0x0f;
+		memcpy(polys->data_triangles, oldtriangles, polys->num_triangles*sizeof(vmpolygons_triangle_t));
+		memcpy(polys->data_sortedelement3i, oldsortedelement3i, polys->num_triangles*sizeof(int[3]));
+	}
+	if (oldvertex3f)
+		Mem_Free(oldvertex3f);
+	if (oldcolor4f)
+		Mem_Free(oldcolor4f);
+	if (oldtexcoord2f)
+		Mem_Free(oldtexcoord2f);
+	if (oldtriangles)
+		Mem_Free(oldtriangles);
+	if (oldsortedelement3i)
+		Mem_Free(oldsortedelement3i);
+}
+
+static void VM_InitPolygons (vmpolygons_t* polys)
+{
+	memset(polys, 0, sizeof(*polys));
+	polys->pool = Mem_AllocPool("VMPOLY", 0, NULL);
+	polys->max_triangles = 1024;
+	VM_ResizePolygons(polys);
+	polys->initialized = true;
+}
 
-		if(flags == DRAWFLAG_ADDITIVE)
+static void VM_DrawPolygonCallback (const entity_render_t *ent, const rtlight_t *rtlight, int numsurfaces, int *surfacelist)
+{
+	int surfacelistindex;
+	vmpolygons_t* polys = vmpolygons + PRVM_GetProgNr();
+	R_Mesh_Matrix(&identitymatrix);
+	GL_CullFace(GL_NONE);
+	R_Mesh_VertexPointer(polys->data_vertex3f, 0, 0);
+	R_Mesh_ColorPointer(polys->data_color4f, 0, 0);
+	R_Mesh_TexCoordPointer(0, 2, polys->data_texcoord2f, 0, 0);
+	R_SetupGenericShader(true);
+	for (surfacelistindex = 0;surfacelistindex < numsurfaces;)
+	{
+		int numtriangles = 0;
+		rtexture_t *tex = polys->data_triangles[surfacelist[surfacelistindex]].texture;
+		int drawflag = polys->data_triangles[surfacelist[surfacelistindex]].drawflag;
+		if(drawflag == DRAWFLAG_ADDITIVE)
 			GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
-		else if(flags == DRAWFLAG_MODULATE)
+		else if(drawflag == DRAWFLAG_MODULATE)
 			GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
-		else if(flags == DRAWFLAG_2XMODULATE)
+		else if(drawflag == DRAWFLAG_2XMODULATE)
 			GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
 		else
 			GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-		R_Mesh_TexBind(0, R_GetTexture(p->tex));
-
-		CHECKGLERROR
-		//[515]: is speed is max ?
-		if(p->flags & VM_POLYGON_FLLINES)	//[515]: lines
+		R_Mesh_TexBind(0, R_GetTexture(tex));
+		numtriangles = 0;
+		for (;surfacelistindex < numsurfaces;surfacelistindex++)
 		{
-			qglLineWidth(p->data[13]);CHECKGLERROR
-			qglBegin(GL_LINE_LOOP);
-				qglTexCoord1f	(p->data[12]);
-				qglColor4f		(p->data[20], p->data[21], p->data[22], p->data[23]);
-				qglVertex3f		(p->data[0] , p->data[1],  p->data[2]);
-
-				qglTexCoord1f	(p->data[14]);
-				qglColor4f		(p->data[24], p->data[25], p->data[26], p->data[27]);
-				qglVertex3f		(p->data[3] , p->data[4],  p->data[5]);
-
-				if(p->flags & VM_POLYGON_FL3V)
-				{
-					qglTexCoord1f	(p->data[16]);
-					qglColor4f		(p->data[28], p->data[29], p->data[30], p->data[31]);
-					qglVertex3f		(p->data[6] , p->data[7],  p->data[8]);
-
-					if(p->flags & VM_POLYGON_FL4V)
-					{
-						qglTexCoord1f	(p->data[18]);
-						qglColor4f		(p->data[32], p->data[33], p->data[34], p->data[35]);
-						qglVertex3f		(p->data[9] , p->data[10],  p->data[11]);
-					}
-				}
-			qglEnd();
-			CHECKGLERROR
-		}
-		else
-		{
-			qglBegin(GL_POLYGON);
-				qglTexCoord2f	(p->data[12], p->data[13]);
-				qglColor4f		(p->data[20], p->data[21], p->data[22], p->data[23]);
-				qglVertex3f		(p->data[0] , p->data[1],  p->data[2]);
-
-				qglTexCoord2f	(p->data[14], p->data[15]);
-				qglColor4f		(p->data[24], p->data[25], p->data[26], p->data[27]);
-				qglVertex3f		(p->data[3] , p->data[4],  p->data[5]);
-
-				qglTexCoord2f	(p->data[16], p->data[17]);
-				qglColor4f		(p->data[28], p->data[29], p->data[30], p->data[31]);
-				qglVertex3f		(p->data[6] , p->data[7],  p->data[8]);
-
-				if(p->flags & VM_POLYGON_FL4V)
-				{
-					qglTexCoord2f	(p->data[18], p->data[19]);
-					qglColor4f		(p->data[32], p->data[33], p->data[34], p->data[35]);
-					qglVertex3f		(p->data[9] , p->data[10],  p->data[11]);
-				}
-			qglEnd();
-			CHECKGLERROR
+			if (polys->data_triangles[surfacelist[surfacelistindex]].texture != tex || polys->data_triangles[surfacelist[surfacelistindex]].drawflag != drawflag)
+				break;
+			VectorCopy(polys->data_triangles[surfacelist[surfacelistindex]].element3i, polys->data_sortedelement3i + 3*numtriangles);
+			numtriangles++;
 		}
+		R_Mesh_Draw(0, polys->num_vertices, numtriangles, polys->data_sortedelement3i, 0, 0);
 	}
 }
 
-static void VM_CL_AddPolygonTo2DScene (vm_polygon_t *p)
+void VMPolygons_Store(vmpolygons_t *polys)
 {
-	drawqueuemesh_t	mesh;
-	static int		picelements[6] = {0, 1, 2, 0, 2, 3};
-
-	mesh.texture = p->tex;
-	mesh.data_element3i = picelements;
-	mesh.data_vertex3f = p->data;
-	mesh.data_texcoord2f = p->data + 12;
-	mesh.data_color4f = p->data + 20;
-	if(p->flags & VM_POLYGON_FL4V)
+	if (r_refdef.draw2dstage)
 	{
-		mesh.num_vertices = 4;
-		mesh.num_triangles = 2;
+		// draw the polygon as 2D immediately
+		drawqueuemesh_t mesh;
+		mesh.texture = polys->begin_texture;
+		mesh.num_vertices = polys->begin_vertices;
+		mesh.num_triangles = polys->begin_vertices-2;
+		mesh.data_element3i = polygonelements;
+		mesh.data_vertex3f = polys->begin_vertex[0];
+		mesh.data_color4f = polys->begin_color[0];
+		mesh.data_texcoord2f = polys->begin_texcoord[0];
+		DrawQ_Mesh(&mesh, polys->begin_drawflag);
 	}
 	else
 	{
-		mesh.num_vertices = 3;
-		mesh.num_triangles = 1;
+		// queue the polygon as 3D for sorted transparent rendering later
+		int i;
+		if (polys->max_triangles < polys->num_triangles + polys->begin_vertices-2)
+		{
+			polys->max_triangles *= 2;
+			VM_ResizePolygons(polys);
+		}
+		// needle in a haystack!
+		// polys->num_vertices was used for copying where we actually want to copy begin_vertices
+		// that also caused it to not render the first polygon that is added
+		// --blub
+		memcpy(polys->data_vertex3f + polys->num_vertices * 3, polys->begin_vertex[0], polys->begin_vertices * sizeof(float[3]));
+		memcpy(polys->data_color4f + polys->num_vertices * 4, polys->begin_color[0], polys->begin_vertices * sizeof(float[4]));
+		memcpy(polys->data_texcoord2f + polys->num_vertices * 2, polys->begin_texcoord[0], polys->begin_vertices * sizeof(float[2]));
+		for (i = 0;i < polys->begin_vertices-2;i++)
+		{
+			polys->data_triangles[polys->num_triangles].texture = polys->begin_texture;
+			polys->data_triangles[polys->num_triangles].drawflag = polys->begin_drawflag;
+			polys->data_triangles[polys->num_triangles].element3i[0] = polys->num_vertices;
+			polys->data_triangles[polys->num_triangles].element3i[1] = polys->num_vertices + i+1;
+			polys->data_triangles[polys->num_triangles].element3i[2] = polys->num_vertices + i+2;
+			polys->num_triangles++;
+		}
+		polys->num_vertices += polys->begin_vertices;
 	}
-	if(p->flags & VM_POLYGON_FLLINES)	//[515]: lines
-		DrawQ_LineLoop (&mesh, (p->flags&0x0f));
-	else
-		DrawQ_Mesh (&mesh, (p->flags&0x0f));
+	polys->begin_active = false;
 }
 
+// TODO: move this into the client code and clean-up everything else, too! [1/6/2008 Black]
+// LordHavoc: agreed, this is a mess
 void VM_CL_AddPolygonsToMeshQueue (void)
 {
 	int i;
-	if(!vm_drawpolygons_num)
+	vmpolygons_t* polys = vmpolygons + PRVM_GetProgNr();
+	vec3_t center;
+
+	// only add polygons of the currently active prog to the queue - if there is none, we're done
+	if( !prog )
 		return;
-	R_Mesh_Matrix(&identitymatrix);
-	GL_CullFace(GL_NONE);
-	for(i = 0;i < (int)vm_drawpolygons_num;i++)
-		VM_DrawPolygonCallback(NULL, NULL, 1, &i);
-	vm_drawpolygons_num = 0;
+
+	if (!polys->num_triangles)
+		return;
+
+	for (i = 0;i < polys->num_triangles;i++)
+	{
+		VectorMAMAM(1.0f / 3.0f, polys->data_vertex3f + 3*polys->data_triangles[i].element3i[0], 1.0f / 3.0f, polys->data_vertex3f + 3*polys->data_triangles[i].element3i[1], 1.0f / 3.0f, polys->data_vertex3f + 3*polys->data_triangles[i].element3i[2], center);
+		R_MeshQueue_AddTransparent(center, VM_DrawPolygonCallback, NULL, i, NULL);
+	}
+
+	/*polys->num_triangles = 0; // now done after rendering the scene,
+	  polys->num_vertices = 0;  // otherwise it's not rendered at all and prints an error message --blub */
 }
 
-//void(string texturename, float flag[, float 2d[, float lines]]) R_BeginPolygon
-static void VM_CL_R_PolygonBegin (void)
+//void(string texturename, float flag) R_BeginPolygon
+void VM_CL_R_PolygonBegin (void)
 {
-	vm_polygon_t	*p;
 	const char		*picname;
-	VM_SAFEPARMCOUNTRANGE(2, 4, VM_CL_R_PolygonBegin);
+	vmpolygons_t* polys = vmpolygons + PRVM_GetProgNr();
+
+	VM_SAFEPARMCOUNT(2, VM_CL_R_PolygonBegin);
 
-	if(!vm_polygons_initialized)
-		VM_InitPolygons();
-	if(vm_polygonbegin)
+	if (!polys->initialized)
+		VM_InitPolygons(polys);
+	if (polys->begin_active)
 	{
-		VM_Warning("VM_CL_R_PolygonBegin: called twice without VM_CL_R_PolygonEnd after first\n");
+		VM_Warning("VM_CL_R_PolygonBegin: called twice without VM_CL_R_PolygonBegin after first\n");
 		return;
 	}
-	if(vm_drawpolygons_num >= vm_polygons_num)
-	{
-		p = (vm_polygon_t *)Mem_Alloc(vm_polygons_pool, 2 * vm_polygons_num * sizeof(vm_polygon_t));
-		memset(p, 0, 2 * vm_polygons_num * sizeof(vm_polygon_t));
-		memcpy(p, vm_polygons, vm_polygons_num * sizeof(vm_polygon_t));
-		Mem_Free(vm_polygons);
-		vm_polygons = p;
-		vm_polygons_num *= 2;
-	}
-	p = &vm_polygons[vm_drawpolygons_num];
 	picname = PRVM_G_STRING(OFS_PARM0);
-	if(picname[0])
-		p->tex = Draw_CachePic(picname, true)->tex;
-	else
-		p->tex = r_texture_white;
-	p->flags = (unsigned char)PRVM_G_FLOAT(OFS_PARM1);
-	vm_current_vertices = 0;
-	vm_polygonbegin = true;
-	if(prog->argc >= 3)
-	{
-		if(PRVM_G_FLOAT(OFS_PARM2))
-			p->flags |= VM_POLYGON_FL2D;
-		if(prog->argc >= 4 && PRVM_G_FLOAT(OFS_PARM3))
-		{
-			p->data[13] = PRVM_G_FLOAT(OFS_PARM3);	//[515]: linewidth
-			p->flags |= VM_POLYGON_FLLINES;
-		}
-	}
+	polys->begin_texture = picname[0] ? Draw_CachePic (picname)->tex : r_texture_white;
+	polys->begin_drawflag = (int)PRVM_G_FLOAT(OFS_PARM1);
+	polys->begin_vertices = 0;
+	polys->begin_active = true;
 }
 
 //void(vector org, vector texcoords, vector rgb, float alpha) R_PolygonVertex
-static void VM_CL_R_PolygonVertex (void)
+void VM_CL_R_PolygonVertex (void)
 {
-	float			*coords, *tx, *rgb, alpha;
-	vm_polygon_t	*p;
+	vmpolygons_t* polys = vmpolygons + PRVM_GetProgNr();
+
 	VM_SAFEPARMCOUNT(4, VM_CL_R_PolygonVertex);
 
-	if(!vm_polygonbegin)
+	if (!polys->begin_active)
 	{
 		VM_Warning("VM_CL_R_PolygonVertex: VM_CL_R_PolygonBegin wasn't called\n");
 		return;
 	}
-	coords	= PRVM_G_VECTOR(OFS_PARM0);
-	tx		= PRVM_G_VECTOR(OFS_PARM1);
-	rgb		= PRVM_G_VECTOR(OFS_PARM2);
-	alpha = PRVM_G_FLOAT(OFS_PARM3);
 
-	p = &vm_polygons[vm_drawpolygons_num];
-	if(vm_current_vertices > 4)
+	if (polys->begin_vertices >= VMPOLYGONS_MAXPOINTS)
 	{
-		VM_Warning("VM_CL_R_PolygonVertex: may have 4 vertices max\n");
+		VM_Warning("VM_CL_R_PolygonVertex: may have %i vertices max\n", VMPOLYGONS_MAXPOINTS);
 		return;
 	}
 
-	p->data[vm_current_vertices*3]		= coords[0];
-	p->data[1+vm_current_vertices*3]	= coords[1];
-	p->data[2+vm_current_vertices*3]	= coords[2];
-
-	p->data[12+vm_current_vertices*2]	= tx[0];
-	if(!(p->flags & VM_POLYGON_FLLINES))
-		p->data[13+vm_current_vertices*2]	= tx[1];
-
-	p->data[20+vm_current_vertices*4]	= rgb[0];
-	p->data[21+vm_current_vertices*4]	= rgb[1];
-	p->data[22+vm_current_vertices*4]	= rgb[2];
-	p->data[23+vm_current_vertices*4]	= alpha;
-
-	vm_current_vertices++;
-	if(vm_current_vertices == 4)
-		p->flags |= VM_POLYGON_FL4V;
-	else
-		if(vm_current_vertices == 3)
-			p->flags |= VM_POLYGON_FL3V;
+	polys->begin_vertex[polys->begin_vertices][0] = PRVM_G_VECTOR(OFS_PARM0)[0];
+	polys->begin_vertex[polys->begin_vertices][1] = PRVM_G_VECTOR(OFS_PARM0)[1];
+	polys->begin_vertex[polys->begin_vertices][2] = PRVM_G_VECTOR(OFS_PARM0)[2];
+	polys->begin_texcoord[polys->begin_vertices][0] = PRVM_G_VECTOR(OFS_PARM1)[0];
+	polys->begin_texcoord[polys->begin_vertices][1] = PRVM_G_VECTOR(OFS_PARM1)[1];
+	polys->begin_color[polys->begin_vertices][0] = PRVM_G_VECTOR(OFS_PARM2)[0];
+	polys->begin_color[polys->begin_vertices][1] = PRVM_G_VECTOR(OFS_PARM2)[1];
+	polys->begin_color[polys->begin_vertices][2] = PRVM_G_VECTOR(OFS_PARM2)[2];
+	polys->begin_color[polys->begin_vertices][3] = PRVM_G_FLOAT(OFS_PARM3);
+	polys->begin_vertices++;
 }
 
 //void() R_EndPolygon
-static void VM_CL_R_PolygonEnd (void)
+void VM_CL_R_PolygonEnd (void)
 {
+	vmpolygons_t* polys = vmpolygons + PRVM_GetProgNr();
+
 	VM_SAFEPARMCOUNT(0, VM_CL_R_PolygonEnd);
-	if(!vm_polygonbegin)
+	if (!polys->begin_active)
 	{
 		VM_Warning("VM_CL_R_PolygonEnd: VM_CL_R_PolygonBegin wasn't called\n");
 		return;
 	}
-	vm_polygonbegin = false;
-	if(vm_current_vertices > 2 || (vm_current_vertices >= 2 && vm_polygons[vm_drawpolygons_num].flags & VM_POLYGON_FLLINES))
-	{
-		if(vm_polygons[vm_drawpolygons_num].flags & VM_POLYGON_FL2D)	//[515]: don't use qcpolygons memory if 2D
-			VM_CL_AddPolygonTo2DScene(&vm_polygons[vm_drawpolygons_num]);
-		else
-			vm_drawpolygons_num++;
-	}
+	polys->begin_active = false;
+	if (polys->begin_vertices >= 3)
+		VMPolygons_Store(polys);
 	else
-		VM_Warning("VM_CL_R_PolygonEnd: %i vertices isn't a good choice\n", vm_current_vertices);
+		VM_Warning("VM_CL_R_PolygonEnd: %i vertices isn't a good choice\n", polys->begin_vertices);
 }
 
-void Debug_PolygonBegin(const char *picname, int flags, qboolean draw2d, float linewidth)
-{
-	vm_polygon_t	*p;
+static vmpolygons_t debugPolys;
 
-	if(!vm_polygons_initialized)
-		VM_InitPolygons();
-	if(vm_polygonbegin)
+void Debug_PolygonBegin(const char *picname, int drawflag)
+{
+	if(!debugPolys.initialized)
+		VM_InitPolygons(&debugPolys);
+	if(debugPolys.begin_active)
 	{
 		Con_Printf("Debug_PolygonBegin: called twice without Debug_PolygonEnd after first\n");
 		return;
 	}
-	// limit polygons to a vaguely sane amount, beyond this each one just
-	// replaces the last one
-	vm_drawpolygons_num = min(vm_drawpolygons_num, (1<<20)-1);
-	if(vm_drawpolygons_num >= vm_polygons_num)
-	{
-		p = (vm_polygon_t *)Mem_Alloc(vm_polygons_pool, 2 * vm_polygons_num * sizeof(vm_polygon_t));
-		memset(p, 0, 2 * vm_polygons_num * sizeof(vm_polygon_t));
-		memcpy(p, vm_polygons, vm_polygons_num * sizeof(vm_polygon_t));
-		Mem_Free(vm_polygons);
-		vm_polygons = p;
-		vm_polygons_num *= 2;
-	}
-	p = &vm_polygons[vm_drawpolygons_num];
-	if(picname && picname[0])
-		p->tex = Draw_CachePic(picname, true)->tex;
-	else
-		p->tex = r_texture_white;
-	p->flags = flags;
-	vm_current_vertices = 0;
-	vm_polygonbegin = true;
-	if(draw2d)
-		p->flags |= VM_POLYGON_FL2D;
-	if(linewidth)
-	{
-		p->data[13] = linewidth;	//[515]: linewidth
-		p->flags |= VM_POLYGON_FLLINES;
-	}
+	debugPolys.begin_texture = picname[0] ? Draw_CachePic (picname)->tex : r_texture_white;
+	debugPolys.begin_drawflag = drawflag;
+	debugPolys.begin_vertices = 0;
+	debugPolys.begin_active = true;
 }
 
 void Debug_PolygonVertex(float x, float y, float z, float s, float t, float r, float g, float b, float a)
 {
-	vm_polygon_t	*p;
-
-	if(!vm_polygonbegin)
+	if(!debugPolys.begin_active)
 	{
 		Con_Printf("Debug_PolygonVertex: Debug_PolygonBegin wasn't called\n");
 		return;
 	}
 
-	p = &vm_polygons[vm_drawpolygons_num];
-	if(vm_current_vertices > 4)
+	if(debugPolys.begin_vertices > VMPOLYGONS_MAXPOINTS)
 	{
-		Con_Printf("Debug_PolygonVertex: may have 4 vertices max\n");
+		Con_Printf("Debug_PolygonVertex: may have %i vertices max\n", VMPOLYGONS_MAXPOINTS);
 		return;
 	}
 
-	p->data[vm_current_vertices*3]		= x;
-	p->data[1+vm_current_vertices*3]	= y;
-	p->data[2+vm_current_vertices*3]	= z;
-
-	p->data[12+vm_current_vertices*2]	= s;
-	if(!(p->flags & VM_POLYGON_FLLINES))
-		p->data[13+vm_current_vertices*2]	= t;
-
-	p->data[20+vm_current_vertices*4]	= r;
-	p->data[21+vm_current_vertices*4]	= g;
-	p->data[22+vm_current_vertices*4]	= b;
-	p->data[23+vm_current_vertices*4]	= a;
-
-	vm_current_vertices++;
-	if(vm_current_vertices == 4)
-		p->flags |= VM_POLYGON_FL4V;
-	else
-		if(vm_current_vertices == 3)
-			p->flags |= VM_POLYGON_FL3V;
+	debugPolys.begin_vertex[debugPolys.begin_vertices][0] = x;
+	debugPolys.begin_vertex[debugPolys.begin_vertices][1] = y;
+	debugPolys.begin_vertex[debugPolys.begin_vertices][2] = z;
+	debugPolys.begin_texcoord[debugPolys.begin_vertices][0] = s;
+	debugPolys.begin_texcoord[debugPolys.begin_vertices][1] = t;
+	debugPolys.begin_color[debugPolys.begin_vertices][0] = r;
+	debugPolys.begin_color[debugPolys.begin_vertices][1] = g;
+	debugPolys.begin_color[debugPolys.begin_vertices][2] = b;
+	debugPolys.begin_color[debugPolys.begin_vertices][3] = a;
+	debugPolys.begin_vertices++;
 }
 
 void Debug_PolygonEnd(void)
 {
-	if(!vm_polygonbegin)
+	if (!debugPolys.begin_active)
 	{
 		Con_Printf("Debug_PolygonEnd: Debug_PolygonBegin wasn't called\n");
 		return;
 	}
-	vm_polygonbegin = false;
-	if(vm_current_vertices > 2 || (vm_current_vertices >= 2 && vm_polygons[vm_drawpolygons_num].flags & VM_POLYGON_FLLINES))
-	{
-		if(vm_polygons[vm_drawpolygons_num].flags & VM_POLYGON_FL2D)	//[515]: don't use qcpolygons memory if 2D
-			VM_CL_AddPolygonTo2DScene(&vm_polygons[vm_drawpolygons_num]);
-		else
-			vm_drawpolygons_num++;
-	}
+	debugPolys.begin_active = false;
+	if (debugPolys.begin_vertices >= 3)
+		VMPolygons_Store(&debugPolys);
 	else
-		Con_Printf("Debug_PolygonEnd: %i vertices isn't a good choice\n", vm_current_vertices);
+		Con_Printf("Debug_PolygonEnd: %i vertices isn't a good choice\n", debugPolys.begin_vertices);
 }
 
 /*
@@ -2745,6 +2851,13 @@ void VM_CL_serverkey(void)
 
 //============================================================================
 
+// To create a almost working builtin file from this replace:
+// "^NULL.*" with ""
+// "^{.*//.*}:Wh\(.*\)" with "\1"
+// "\:" with "//"
+// "^.*//:Wh{\#:d*}:Wh{.*}" with "\2 = \1;"
+// "\n\n+" with "\n\n"
+
 prvm_builtin_t vm_cl_builtins[] = {
 NULL,							// #0 NULL function (not callable) (QUAKE)
 VM_CL_makevectors,				// #1 void(vector ang) makevectors (QUAKE)
@@ -2762,7 +2875,7 @@ VM_vlen,						// #12 float(vector v) vlen (QUAKE)
 VM_vectoyaw,					// #13 float(vector v) vectoyaw (QUAKE)
 VM_CL_spawn,					// #14 entity() spawn (QUAKE)
 VM_remove,						// #15 void(entity e) remove (QUAKE)
-VM_CL_traceline,				// #16 float(vector v1, vector v2, float tryents) traceline (QUAKE)
+VM_CL_traceline,				// #16 float(vector v1, vector v2, float tryents, entity ignoreentity) traceline (QUAKE)
 NULL,							// #17 entity() checkclient (QUAKE)
 VM_find,						// #18 entity(entity start, .string fld, string match) find (QUAKE)
 VM_precache_sound,				// #19 void(string s) precache_sound (QUAKE)
@@ -2778,7 +2891,7 @@ VM_coredump,					// #28 void() coredump (QUAKE)
 VM_traceon,						// #29 void() traceon (QUAKE)
 VM_traceoff,					// #30 void() traceoff (QUAKE)
 VM_eprint,						// #31 void(entity e) eprint (QUAKE)
-VM_CL_walkmove,					// #32 float(float yaw, float dist) walkmove (QUAKE)
+VM_CL_walkmove,					// #32 float(float yaw, float dist[, float settrace]) walkmove (QUAKE)
 NULL,							// #33 (QUAKE)
 VM_CL_droptofloor,				// #34 float() droptofloor (QUAKE)
 VM_CL_lightstyle,				// #35 void(float style, string value) lightstyle (QUAKE)
@@ -3058,7 +3171,7 @@ VM_CL_R_AddDynamicLight,		// #305 void(vector org, float radius, vector lightcol
 VM_CL_R_PolygonBegin,			// #306 void(string texturename, float flag[, float is2d, float lines]) R_BeginPolygon
 VM_CL_R_PolygonVertex,			// #307 void(vector org, vector texcoords, vector rgb, float alpha) R_PolygonVertex
 VM_CL_R_PolygonEnd,				// #308 void() R_EndPolygon
-NULL,							// #309
+NULL /* R_LoadWorldModel in menu VM, should stay unassigned in client*/, // #309
 VM_CL_unproject,				// #310 vector (vector v) cs_unproject (EXT_CSQC)
 VM_CL_project,					// #311 vector (vector v) cs_project (EXT_CSQC)
 NULL,							// #312
@@ -3095,7 +3208,7 @@ VM_CL_getkeybind,				// #342 string(float keynum) getkeybind (EXT_CSQC)
 VM_CL_setcursormode,			// #343 void(float usecursor) setcursormode (EXT_CSQC)
 VM_getmousepos,					// #344 vector() getmousepos (EXT_CSQC)
 VM_CL_getinputstate,			// #345 float(float framenum) getinputstate (EXT_CSQC)
-VM_CL_setsensitivityscale,		// #346 void(float sens) setsensitivityscaler (EXT_CSQC)
+VM_CL_setsensitivityscale,		// #346 void(float sens) setsensitivityscale (EXT_CSQC)
 VM_CL_runplayerphysics,			// #347 void() runstandardplayerphysics (EXT_CSQC)
 VM_CL_getplayerkey,				// #348 string(float playernum, string keyname) getplayerkeyvalue (EXT_CSQC)
 VM_CL_isdemo,					// #349 float() isdemo (EXT_CSQC)
@@ -3117,7 +3230,7 @@ VM_CL_ReadCoord,				// #364 float() readcoord (EXT_CSQC)
 VM_CL_ReadAngle,				// #365 float() readangle (EXT_CSQC)
 VM_CL_ReadString,				// #366 string() readstring (EXT_CSQC)
 VM_CL_ReadFloat,				// #367 float() readfloat (EXT_CSQC)
-NULL,							// #368
+NULL,						// #368
 NULL,							// #369
 NULL,							// #370
 NULL,							// #371
@@ -3207,7 +3320,7 @@ NULL,							// #453 void(entity clent) dropclient (DP_SV_DROPCLIENT)
 NULL,							// #454 entity() spawnclient (DP_SV_BOTCLIENT)
 NULL,							// #455 float(entity clent) clienttype (DP_SV_BOTCLIENT)
 NULL,							// #456 void(float to, string s) WriteUnterminatedString (DP_SV_WRITEUNTERMINATEDSTRING)
-VM_CL_te_flamejet,				// #457 void(vector org, vector vel, float howmany) te_flamejet = #457 (DP_TE_FLAMEJET)
+VM_CL_te_flamejet,				// #457 void(vector org, vector vel, float howmany) te_flamejet (DP_TE_FLAMEJET)
 NULL,							// #458
 VM_ftoe,						// #459 entity(float num) entitybyindex (DP_QC_EDICT_NUM)
 VM_buf_create,					// #460 float() buf_create (DP_QC_STRINGBUFFERS)
@@ -3233,43 +3346,69 @@ VM_tokenizebyseparator,			// #479 float(string s) tokenizebyseparator (DP_QC_TOK
 VM_strtolower,					// #480 string(string s) VM_strtolower (DP_QC_STRING_CASE_FUNCTIONS)
 VM_strtoupper,					// #481 string(string s) VM_strtoupper (DP_QC_STRING_CASE_FUNCTIONS)
 VM_cvar_defstring,				// #482 string(string s) cvar_defstring (DP_QC_CVAR_DEFSTRING)
-VM_CL_pointsound,				// #483 void(vector origin, string sample, float volume, float attenuation) (DP_SV_POINTSOUND)
+VM_CL_pointsound,				// #483 void(vector origin, string sample, float volume, float attenuation) pointsound (DP_SV_POINTSOUND)
 VM_strreplace,					// #484 string(string search, string replace, string subject) strreplace (DP_QC_STRREPLACE)
 VM_strireplace,					// #485 string(string search, string replace, string subject) strireplace (DP_QC_STRREPLACE)
-NULL,							// #486
-NULL,							// #487
-NULL,							// #488
-NULL,							// #489
-NULL,							// #490
-NULL,							// #491
-NULL,							// #492
-NULL,							// #493
-NULL,							// #494
-NULL,							// #495
-NULL,							// #496
-NULL,							// #497
+VM_CL_getsurfacepointattribute,// #486 vector(entity e, float s, float n, float a) getsurfacepointattribute
+VM_gecko_create,					// #487 float gecko_create( string name )
+VM_gecko_destroy,					// #488 void gecko_destroy( string name )
+VM_gecko_navigate,				// #489 void gecko_navigate( string name, string URI )
+VM_gecko_keyevent,				// #490 float gecko_keyevent( string name, float key, float eventtype )
+VM_gecko_movemouse,				// #491 void gecko_mousemove( string name, float x, float y )
+VM_gecko_resize,					// #492 void gecko_resize( string name, float w, float h )
+VM_gecko_get_texture_extent,	// #493 vector gecko_get_texture_extent( string name )
+VM_crc16,						// #494 float(float caseinsensitive, string s, ...) crc16 = #494 (DP_QC_CRC16)
+VM_cvar_type,					// #495 float(string name) cvar_type = #495; (DP_QC_CVAR_TYPE)
+VM_uri_escape,					// #496 string(string in) uri_escape = #496;
+VM_uri_unescape,				// #497 string(string in) uri_unescape = #497;
 NULL,							// #498
 NULL,							// #499
+NULL,							// #500
+NULL,							// #501
+NULL,							// #502
+NULL,							// #503
+NULL,							// #504
+NULL,							// #505
+NULL,							// #506
+NULL,							// #507
+NULL,							// #508
+NULL,							// #509
+VM_uri_escape,					// #510 string(string in) uri_escape = #510;
+VM_uri_unescape,				// #511 string(string in) uri_unescape = #511;
+NULL,							// #512
+NULL,							// #513
+NULL,							// #514
+NULL,							// #515
+NULL,							// #516
+NULL,							// #517
+NULL,							// #518
+NULL,							// #519
 };
 
 const int vm_cl_numbuiltins = sizeof(vm_cl_builtins) / sizeof(prvm_builtin_t);
 
-void VM_CL_Cmd_Init(void)
+void VM_Polygons_Reset(void)
 {
+	vmpolygons_t* polys = vmpolygons + PRVM_GetProgNr();
+
 	// TODO: replace vm_polygons stuff with a more general debugging polygon system, and make vm_polygons functions use that system
-	if(vm_polygons_initialized)
+	if(polys->initialized)
 	{
-		Mem_FreePool(&vm_polygons_pool);
-		vm_polygons_initialized = false;
+		Mem_FreePool(&polys->pool);
+		polys->initialized = false;
 	}
 }
 
+void VM_CL_Cmd_Init(void)
+{
+	VM_Cmd_Init();
+	VM_Polygons_Reset();
+}
+
 void VM_CL_Cmd_Reset(void)
 {
-	if(vm_polygons_initialized)
-	{
-		Mem_FreePool(&vm_polygons_pool);
-		vm_polygons_initialized = false;
-	}
+	VM_Cmd_Reset();
+	VM_Polygons_Reset();
 }
 
+