X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=prvm_cmds.c;h=c0cc2c2a6630cef9848eda058a59efca6fa20e4a;hp=cad16a48cf21ed978763549fd89f01ab8666760b;hb=5828c1a01ad212cd726a176e34f1d07be7410ff9;hpb=57e83cd494aff0694a774d2ceed7d350f35e134c

diff --git a/prvm_cmds.c b/prvm_cmds.c
index cad16a48..c0cc2c2a 100644
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -4,194 +4,13 @@
 // cause large (I think they will) parts are from pr_cmds the same copyright like in pr_cmds
 // also applies here
 
-
-/*
-============================================================================
-common cmd list:
-=================
-
-		checkextension(string)
-		error(...[string])
-		objerror(...[string)
-		print(...[strings])
-		bprint(...[string])
-		sprint(float clientnum,...[string])
-		centerprint(...[string])
-vector	normalize(vector)
-float	vlen(vector)
-float	vectoyaw(vector)
-vector	vectoangles(vector)
-float	random()
-		cmd(string)
-		float cvar (string)
-		cvar_set (string,string)
-		dprint(...[string])
-string	ftos(float)
-float	fabs(float)
-string	vtos(vector)
-string	etos(entity)
-float	stof(...[string])
-entity	spawn()
-		remove(entity e)
-entity	find(entity start, .string field, string match)
-
-entity	findfloat(entity start, .float field, float match)
-entity	findentity(entity start, .entity field, entity match)
-
-entity	findchain(.string field, string match)
-
-entity	findchainfloat(.string field, float match)
-entity	findchainentity(.string field, entity match)
-  
-string	precache_file(string)
-string	precache_sound (string sample)
-		coredump()
-		traceon()
-		traceoff()
-		eprint(entity e)
-float	rint(float)
-float	floor(float)
-float	ceil(float)
-entity	nextent(entity)
-float	sin(float)
-float	cos(float)
-float	sqrt(float)
-vector	randomvec()
-float	registercvar (string name, string value, float flags)
-float	min(float a, float b, ...[float])
-float	max(float a, float b, ...[float])
-float	bound(float min, float value, float max)
-float	pow(float a, float b)
-		copyentity(entity src, entity dst)
-float	fopen(string filename, float mode)
-		fclose(float fhandle)
-string	fgets(float fhandle)
-		fputs(float fhandle, string s)
-float	strlen(string s)
-string	strcat(string,string,...[string])
-string	substring(string s, float start, float length)
-vector	stov(string s)
-string	strzone(string s)
-		strunzone(string s)
-float	tokenize(string s)
-string	argv(float n)
-float	isserver()
-float	clientcount()
-float	clientstate()
-		clientcommand(float client, string s) (for client and menu)
-		changelevel(string map)
-		localsound(string sample)
-vector	getmousepos()
-float	gettime()
-		loadfromdata(string data)
-		loadfromfile(string file)
-float	mod(float val, float m)
-const string	str_cvar (string)
-		crash()
-		stackdump()
-		
-float	search_begin(string pattern, float caseinsensitive, float quiet)
-void	search_end(float handle)
-float	search_getsize(float handle)
-string	search_getfilename(float handle, float num)
-
-string	chr(float ascii)
-
-float	itof(intt ent)
-intt	ftoi(float num)
-
-float	altstr_count(string)
-string	altstr_prepare(string)
-string	altstr_get(string,float)
-		
-perhaps only : Menu : WriteMsg 
-===============================
-
-		WriteByte(float data, float dest, float desto)
-		WriteChar(float data, float dest, float desto)
-		WriteShort(float data, float dest, float desto)
-		WriteLong(float data, float dest, float desto)
-		WriteAngle(float data, float dest, float desto)
-		WriteCoord(float data, float dest, float desto)
-		WriteString(string data, float dest, float desto)
-		WriteEntity(entity data, float dest, float desto)
-		
-Client & Menu : draw functions & video functions
-===================================================
-
-float	iscachedpic(string pic)
-string	precache_pic(string pic) 
-		freepic(string s)
-float	drawcharacter(vector position, float character, vector scale, vector rgb, float alpha, float flag)
-float	drawstring(vector position, string text, vector scale, vector rgb, float alpha, float flag)
-float	drawpic(vector position, string pic, vector size, vector rgb, float alpha, float flag)
-float	drawfill(vector position, vector size, vector rgb, float alpha, float flag)
-		drawsetcliparea(float x, float y, float width, float height)
-		drawresetcliparea()
-vector	getimagesize(string pic)
-
-float	cin_open(string file, string name)
-void	cin_close(string name)
-void	cin_setstate(string name, float type)
-float	cin_getstate(string name)		
-void	cin_restart(string name)
-
-==============================================================================
-menu cmd list:
-===============
-
-		setkeydest(float dest)
-float	getkeydest()
-		setmousetarget(float target)
-float	getmousetarget(void)
-
-		callfunction(...,string function_name)
-		writetofile(float fhandle, entity ent)
-float	isfunction(string function_name)
-vector	getresolution(float number)
-string	keynumtostring(float keynum)
-string	findkeysforcommand(string command)
-float	gethostcachevalue(float type)
-string	gethostcachestring(float type, float hostnr)
-
-		parseentitydata(entity ent, string data)
-*/
-
-#include "quakedef.h"
-#include "progdefs.h"
-#include "progsvm.h"
-#include "clprogdefs.h"
-#include "mprogdefs.h"
-
-#include "cl_video.h"
-
-//============================================================================
-// nice helper macros
-
-#ifndef VM_NOPARMCHECK
-#define VM_SAFEPARMCOUNT(p,f)	if(prog->argc != p) PRVM_ERROR(#f " wrong parameter count (" #p " expected ) !\n")
-#else
-#define VM_SAFEPARMCOUNT(p,f)
-#endif
-
-#define	VM_RETURN_EDICT(e)		(((int *)prog->globals)[OFS_RETURN] = PRVM_EDICT_TO_PROG(e))
-
-#define VM_STRINGS_MEMPOOL		vm_strings_mempool[PRVM_GetProgNr()]
-
-#define e10 0,0,0,0,0,0,0,0,0,0
-#define e100 e10,e10,e10,e10,e10,e10,e10,e10,e10,e10
-#define e1000 e100,e100,e100,e100,e100,e100,e100,e100,e100,e100
+#include "prvm_cmds.h"
 
 //============================================================================
 // Common
 
-// string zone mempool
-mempool_t *vm_strings_mempool[PRVM_MAXPROGS];
-
 // temp string handling
 // LordHavoc: added this to semi-fix the problem of using many ftos calls in a print
-#define VM_STRINGTEMP_BUFFERS 16
-#define VM_STRINGTEMP_LENGTH 4096
 static char vm_string_temp[VM_STRINGTEMP_BUFFERS][VM_STRINGTEMP_LENGTH];
 static int vm_string_tempindex = 0;
 
@@ -209,7 +28,7 @@ qfile_t *vm_files[MAX_PRVMFILES];
 
 fssearch_t *vm_fssearchlist[TOTAL_VMSEARCHES];
 
-static char *VM_GetTempString(void)
+char *VM_GetTempString(void)
 {
 	char *s;
 	s = vm_string_temp[vm_string_tempindex];
@@ -217,7 +36,7 @@ static char *VM_GetTempString(void)
 	return s;
 }
 
-void VM_CheckEmptyString (char *s)
+void VM_CheckEmptyString (const char *s)
 {
 	if (s[0] <= ' ')
 		PRVM_ERROR ("%s: Bad string", PRVM_NAME);
@@ -253,11 +72,11 @@ checkextension(extensionname)
 */
 
 // kind of helper function
-static qboolean checkextension(char *name)
+static qboolean checkextension(const char *name)
 {
 	int len;
 	char *e, *start;
-	len = strlen(name);
+	len = (int)strlen(name);
 
 	for (e = prog->extensionstring;*e;e++)
 	{
@@ -268,11 +87,8 @@ static qboolean checkextension(char *name)
 		start = e;
 		while (*e && *e != ' ')
 			e++;
-		if (e - start == len)
-			if (!strncasecmp(start, name, len))
-			{
-				return true;
-			}
+		if ((e - start) == len && !strncasecmp(start, name, len))
+			return true;
 	}
 	return false;
 }
@@ -336,7 +152,7 @@ void VM_objerror (void)
 	}
 	else
 		// objerror has to display the object fields -> else call
-		PRVM_ERROR ("VM_objecterror: self not defined !\n");
+		PRVM_ERROR ("VM_objecterror: self not defined !");
 }
 
 /*
@@ -401,7 +217,7 @@ void VM_sprint (void)
 		Con_Printf("VM_sprint: %s: invalid client or server is not active !\n", PRVM_NAME);
 		return;
 	}
-	
+
 	client = svs.clients + clientnum;
 	VM_VarString(1, string, sizeof(string));
 	MSG_WriteChar(&client->message,svc_print);
@@ -436,24 +252,20 @@ void VM_normalize (void)
 {
 	float	*value1;
 	vec3_t	newvalue;
-	float	new;
+	double	f;
 
 	VM_SAFEPARMCOUNT(1,VM_normalize);
 
 	value1 = PRVM_G_VECTOR(OFS_PARM0);
 
-	new = value1[0] * value1[0] + value1[1] * value1[1] + value1[2]*value1[2];
-	new = sqrt(new);
-
-	if (new == 0)
-		newvalue[0] = newvalue[1] = newvalue[2] = 0;
-	else
+	f = VectorLength2(value1);
+	if (f)
 	{
-		new = 1/new;
-		newvalue[0] = value1[0] * new;
-		newvalue[1] = value1[1] * new;
-		newvalue[2] = value1[2] * new;
+		f = 1.0 / sqrt(f);
+		VectorScale(value1, f, newvalue);
 	}
+	else
+		VectorClear(newvalue);
 
 	VectorCopy (newvalue, PRVM_G_VECTOR(OFS_RETURN));
 }
@@ -467,17 +279,8 @@ scalar vlen(vector)
 */
 void VM_vlen (void)
 {
-	float	*value1;
-	float	new;
-
 	VM_SAFEPARMCOUNT(1,VM_vlen);
-
-	value1 = PRVM_G_VECTOR(OFS_PARM0);
-
-	new = value1[0] * value1[0] + value1[1] * value1[1] + value1[2]*value1[2];
-	new = sqrt(new);
-
-	PRVM_G_FLOAT(OFS_RETURN) = new;
+	PRVM_G_FLOAT(OFS_RETURN) = VectorLength(PRVM_G_VECTOR(OFS_PARM0));
 }
 
 /*
@@ -549,7 +352,7 @@ void VM_vectoangles (void)
 			yaw = 270;
 
 		forward = sqrt(value1[0]*value1[0] + value1[1]*value1[1]);
-		pitch = (int) (atan2(value1[2], forward) * 180 / M_PI);
+		pitch = (atan2(value1[2], forward) * 180 / M_PI);
 		if (pitch < 0)
 			pitch += 360;
 	}
@@ -595,15 +398,15 @@ void PF_sound (void)
 {
 	char		*sample;
 	int			channel;
-	edict_t		*entity;
+	prvm_edict_t		*entity;
 	int 		volume;
 	float attenuation;
 
-	entity = G_EDICT(OFS_PARM0);
-	channel = G_FLOAT(OFS_PARM1);
-	sample = G_STRING(OFS_PARM2);
-	volume = G_FLOAT(OFS_PARM3) * 255;
-	attenuation = G_FLOAT(OFS_PARM4);
+	entity = PRVM_G_EDICT(OFS_PARM0);
+	channel = PRVM_G_FLOAT(OFS_PARM1);
+	sample = PRVM_G_STRING(OFS_PARM2);
+	volume = PRVM_G_FLOAT(OFS_PARM3) * 255;
+	attenuation = PRVM_G_FLOAT(OFS_PARM4);
 
 	if (volume < 0 || volume > 255)
 		Host_Error ("SV_StartSound: volume = %i", volume);
@@ -627,8 +430,8 @@ localsound(string sample)
 */
 void VM_localsound(void)
 {
-	char *s;
-	
+	const char *s;
+
 	VM_SAFEPARMCOUNT(1,VM_localsound);
 
 	s = PRVM_G_STRING(OFS_PARM0);
@@ -638,7 +441,7 @@ void VM_localsound(void)
 		Con_Printf("VM_localsound: Failed to play %s for %s !\n", s, PRVM_NAME);
 		PRVM_G_FLOAT(OFS_RETURN) = -4;
 		return;
-	}		
+	}
 
 	PRVM_G_FLOAT(OFS_RETURN) = 1;
 }
@@ -663,15 +466,16 @@ VM_localcmd
 
 Sends text over to the client's execution buffer
 
-[localcmd (string) or]
-cmd (string)
+[localcmd (string, ...) or]
+cmd (string, ...)
 =================
 */
 void VM_localcmd (void)
 {
+	char string[VM_STRINGTEMP_LENGTH];
 	VM_SAFEPARMCOUNT(1,VM_localcmd);
-
-	Cbuf_AddText(PRVM_G_STRING(OFS_PARM0));
+	VM_VarString(0, string, sizeof(string));
+	Cbuf_AddText(string);
 }
 
 /*
@@ -690,33 +494,64 @@ void VM_cvar (void)
 
 /*
 =================
-VM_str_cvar
+VM_cvar_string
 
-const string	str_cvar (string)
+const string	VM_cvar_string (string)
 =================
 */
-void VM_str_cvar(void) 
+void VM_cvar_string(void)
 {
-	char *out, *name;
+	char *out;
+	const char *name;
 	const char *cvar_string;
-	VM_SAFEPARMCOUNT(1,VM_str_cvar);
+	VM_SAFEPARMCOUNT(1,VM_cvar_string);
 
 	name = PRVM_G_STRING(OFS_PARM0);
 
 	if(!name)
-		PRVM_ERROR("VM_str_cvar: %s: null string\n", PRVM_NAME);
+		PRVM_ERROR("VM_cvar_string: %s: null string", PRVM_NAME);
 
 	VM_CheckEmptyString(name);
 
-	out = VM_GetTempString(); 
+	out = VM_GetTempString();
 
 	cvar_string = Cvar_VariableString(name);
-	
+
 	strcpy(out, cvar_string);
 
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetString(out);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(out);
 }
 
+
+/*
+========================
+VM_cvar_defstring
+
+const string	VM_cvar_defstring (string)
+========================
+*/
+void VM_cvar_defstring (void)
+{
+	char *out;
+	const char *name;
+	const char *cvar_string;
+	VM_SAFEPARMCOUNT(1,VM_cvar_string);
+
+	name = PRVM_G_STRING(OFS_PARM0);
+
+	if(!name)
+		PRVM_ERROR("VM_cvar_defstring: %s: null string", PRVM_NAME);
+
+	VM_CheckEmptyString(name);
+
+	out = VM_GetTempString();
+
+	cvar_string = Cvar_VariableDefString(name);
+
+	strcpy(out, cvar_string);
+
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(out);
+}
 /*
 =================
 VM_cvar_set
@@ -744,7 +579,11 @@ void VM_dprint (void)
 	if (developer.integer)
 	{
 		VM_VarString(0, string, sizeof(string));
+#if 1
+		Con_Printf("%s", string);
+#else
 		Con_Printf("%s: %s", PRVM_NAME, string);
+#endif
 	}
 }
 
@@ -770,7 +609,7 @@ void VM_ftos (void)
 		sprintf(s, "%i", (int)v);
 	else
 		sprintf(s, "%f", v);
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetString(s);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(s);
 }
 
 /*
@@ -807,7 +646,7 @@ void VM_vtos (void)
 
 	s = VM_GetTempString();
 	sprintf (s, "'%5.1f %5.1f %5.1f'", PRVM_G_VECTOR(OFS_PARM0)[0], PRVM_G_VECTOR(OFS_PARM0)[1], PRVM_G_VECTOR(OFS_PARM0)[2]);
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetString(s);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(s);
 }
 
 /*
@@ -826,7 +665,7 @@ void VM_etos (void)
 
 	s = VM_GetTempString();
 	sprintf (s, "entity %i", PRVM_G_EDICTNUM(OFS_PARM0));
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetString(s);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(s);
 }
 
 /*
@@ -869,9 +708,9 @@ void VM_ftoi(void)
 	VM_SAFEPARMCOUNT(1, VM_ftoi);
 
 	ent = PRVM_G_FLOAT(OFS_PARM0);
-	if(PRVM_PROG_TO_EDICT(ent)->p.e->free)
-		PRVM_ERROR ("VM_ftoe: %s tried to access a freed entity (entity %i)!\n", PRVM_NAME, ent);
-    
+	if(PRVM_PROG_TO_EDICT(ent)->priv.required->free)
+		PRVM_ERROR ("VM_ftoe: %s tried to access a freed entity (entity %i)!", PRVM_NAME, ent);
+
 	PRVM_G_INT(OFS_RETURN) = ent;
 }
 
@@ -907,11 +746,17 @@ void VM_remove (void)
 	VM_SAFEPARMCOUNT(1, VM_remove);
 
 	ed = PRVM_G_EDICT(OFS_PARM0);
+	if( PRVM_NUM_FOR_EDICT(ed) <= prog->reserved_edicts ) {
+		Con_DPrint( "VM_remove: tried to remove the null entity or a reserved entity!\n" );
+	} else if( ed->priv.required->free ) {
+		Con_DPrint( "VM_remove: tried to remove an already freed entity!\n" );
+	} else {
+		PRVM_ED_Free (ed);
+	}
 //	if (ed == prog->edicts)
-//		PRVM_ERROR ("remove: tried to remove world\n");
+//		PRVM_ERROR ("remove: tried to remove world");
 //	if (PRVM_NUM_FOR_EDICT(ed) <= sv.maxclients)
-//		Host_Error("remove: tried to remove a client\n");
-	PRVM_ED_Free (ed);
+//		Host_Error("remove: tried to remove a client");
 }
 
 /*
@@ -926,7 +771,7 @@ void VM_find (void)
 {
 	int		e;
 	int		f;
-	char	*s, *t;
+	const char	*s, *t;
 	prvm_edict_t	*ed;
 
 	VM_SAFEPARMCOUNT(3,VM_find);
@@ -946,7 +791,7 @@ void VM_find (void)
 	{
 		prog->xfunction->builtinsprofile++;
 		ed = PRVM_EDICT_NUM(e);
-		if (ed->p.e->free)
+		if (ed->priv.required->free)
 			continue;
 		t = PRVM_E_STRING(ed,f);
 		if (!t)
@@ -987,7 +832,7 @@ void VM_findfloat (void)
 	{
 		prog->xfunction->builtinsprofile++;
 		ed = PRVM_EDICT_NUM(e);
-		if (ed->p.e->free)
+		if (ed->priv.required->free)
 			continue;
 		if (PRVM_E_FLOAT(ed,f) == s)
 		{
@@ -1006,7 +851,6 @@ VM_findchain
 entity	findchain(.string field, string match)
 =========
 */
-int PRVM_ED_FindFieldOffset(const char *field);
 // chained search for strings in entity fields
 // entity(.string field, string match) findchain = #402;
 void VM_findchain (void)
@@ -1014,16 +858,16 @@ void VM_findchain (void)
 	int		i;
 	int		f;
 	int		chain_of;
-	char	*s, *t;
+	const char	*s, *t;
 	prvm_edict_t	*ent, *chain;
 
 	VM_SAFEPARMCOUNT(2,VM_findchain);
 
 	// is the same like !(prog->flag & PRVM_FE_CHAIN) - even if the operator precedence is another
 	if(!prog->flag & PRVM_FE_CHAIN)
-		PRVM_ERROR("VM_findchain: %s doesnt have a chain field !\n", PRVM_NAME);
+		PRVM_ERROR("VM_findchain: %s doesnt have a chain field !", PRVM_NAME);
 
-	chain_of = PRVM_ED_FindFieldOffset ("chain");
+	chain_of = PRVM_ED_FindField("chain")->ofs;
 
 	chain = prog->edicts;
 
@@ -1039,7 +883,7 @@ void VM_findchain (void)
 	for (i = 1;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent))
 	{
 		prog->xfunction->builtinsprofile++;
-		if (ent->p.e->free)
+		if (ent->priv.required->free)
 			continue;
 		t = PRVM_E_STRING(ent,f);
 		if (!t)
@@ -1075,9 +919,9 @@ void VM_findchainfloat (void)
 	VM_SAFEPARMCOUNT(2, VM_findchainfloat);
 
 	if(!prog->flag & PRVM_FE_CHAIN)
-		PRVM_ERROR("VM_findchainfloat: %s doesnt have a chain field !\n", PRVM_NAME);
+		PRVM_ERROR("VM_findchainfloat: %s doesnt have a chain field !", PRVM_NAME);
 
-	chain_of = PRVM_ED_FindFieldOffset ("chain");
+	chain_of = PRVM_ED_FindField("chain")->ofs;
 
 	chain = (prvm_edict_t *)prog->edicts;
 
@@ -1088,7 +932,7 @@ void VM_findchainfloat (void)
 	for (i = 1;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent))
 	{
 		prog->xfunction->builtinsprofile++;
-		if (ent->p.e->free)
+		if (ent->priv.required->free)
 			continue;
 		if (PRVM_E_FLOAT(ent,f) != s)
 			continue;
@@ -1101,51 +945,85 @@ void VM_findchainfloat (void)
 }
 
 /*
-=========
-VM_precache_file
+========================
+VM_findflags
 
-string	precache_file(string)
-=========
+entity	findflags(entity start, .float field, float match)
+========================
 */
-void VM_precache_file (void)
-{	// precache_file is only used to copy files with qcc, it does nothing
-	VM_SAFEPARMCOUNT(1,VM_precache_file);
+// LordHavoc: search for flags in float fields
+void VM_findflags (void)
+{
+	int		e;
+	int		f;
+	int		s;
+	prvm_edict_t	*ed;
 
-	PRVM_G_INT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0);
-}
+	VM_SAFEPARMCOUNT(3, VM_findflags);
 
-/*
-=========
-VM_preache_error
 
-used instead of the other VM_precache_* functions in the builtin list
-=========
-*/
+	e = PRVM_G_EDICTNUM(OFS_PARM0);
+	f = PRVM_G_INT(OFS_PARM1);
+	s = (int)PRVM_G_FLOAT(OFS_PARM2);
 
-void VM_precache_error (void)
-{
-	PRVM_ERROR ("PF_Precache_*: Precache can only be done in spawn functions");
+	for (e++ ; e < prog->num_edicts ; e++)
+	{
+		prog->xfunction->builtinsprofile++;
+		ed = PRVM_EDICT_NUM(e);
+		if (ed->priv.required->free)
+			continue;
+		if ((int)PRVM_E_FLOAT(ed,f) & s)
+		{
+			VM_RETURN_EDICT(ed);
+			return;
+		}
+	}
+
+	VM_RETURN_EDICT(prog->edicts);
 }
 
 /*
-=========
-VM_precache_sound
+========================
+VM_findchainflags
 
-string	precache_sound (string sample)
-=========
+entity	findchainflags(.float field, float match)
+========================
 */
-void VM_precache_sound (void)
+// LordHavoc: chained search for flags in float fields
+void VM_findchainflags (void)
 {
-	char	*s;
+	int		i;
+	int		f;
+	int		s;
+	int		chain_of;
+	prvm_edict_t	*ent, *chain;
 
-	VM_SAFEPARMCOUNT(1, VM_precache_sound);
+	VM_SAFEPARMCOUNT(2, VM_findchainflags);
 
-	s = PRVM_G_STRING(OFS_PARM0);
-	PRVM_G_INT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0);
-	VM_CheckEmptyString (s);
+	if(!prog->flag & PRVM_FE_CHAIN)
+		PRVM_ERROR("VM_findchainflags: %s doesnt have a chain field !", PRVM_NAME);
+
+	chain_of = PRVM_ED_FindField("chain")->ofs;
+
+	chain = (prvm_edict_t *)prog->edicts;
+
+	f = PRVM_G_INT(OFS_PARM0);
+	s = (int)PRVM_G_FLOAT(OFS_PARM1);
+
+	ent = PRVM_NEXT_EDICT(prog->edicts);
+	for (i = 1;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent))
+	{
+		prog->xfunction->builtinsprofile++;
+		if (ent->priv.required->free)
+			continue;
+		if (!((int)PRVM_E_FLOAT(ent,f) & s))
+			continue;
+
+		PRVM_E_INT(ent,chain_of) = PRVM_EDICT_TO_PROG(chain);
+		chain = ent;
+	}
 
-	if(!S_PrecacheSound (s,true, true))
-		Con_Printf("VM_precache_sound: Failed to load %s for %s\n", s, PRVM_NAME);
+	VM_RETURN_EDICT(chain);
 }
 
 /*
@@ -1187,11 +1065,11 @@ crash()
 =========
 */
 
-void VM_crash(void) 
+void VM_crash(void)
 {
 	VM_SAFEPARMCOUNT(0, VM_crash);
 
-	PRVM_ERROR("Crash called by %s\n",PRVM_NAME);
+	PRVM_ERROR("Crash called by %s",PRVM_NAME);
 }
 
 /*
@@ -1308,7 +1186,7 @@ void VM_nextent (void)
 			return;
 		}
 		ent = PRVM_EDICT_NUM(i);
-		if (!ent->p.e->free)
+		if (!ent->priv.required->free)
 		{
 			VM_RETURN_EDICT(ent);
 			return;
@@ -1316,98 +1194,6 @@ void VM_nextent (void)
 	}
 }
 
-/*
-===============================================================================
-MESSAGE WRITING
-
-used only for client and menu
-severs uses VM_SV_...
-
-Write*(* data, float type, float to)
-
-===============================================================================
-*/
-
-#define	MSG_BROADCAST	0		// unreliable to all
-#define	MSG_ONE			1		// reliable to one (msg_entity)
-#define	MSG_ALL			2		// reliable to all
-#define	MSG_INIT		3		// write to the init string
-
-sizebuf_t *VM_WriteDest (void)
-{
-	int		dest;
-	int		destclient;
-
-	if(!sv.active)
-		PRVM_ERROR("VM_WriteDest: game is not server (%s)\n", PRVM_NAME);
-
-	dest = G_FLOAT(OFS_PARM1);
-	switch (dest)
-	{
-	case MSG_BROADCAST:
-		return &sv.datagram;
-
-	case MSG_ONE:
-		destclient = (int) PRVM_G_FLOAT(OFS_PARM2);
-		if (destclient < 0 || destclient >= svs.maxclients || !svs.clients[destclient].active)
-			PRVM_ERROR("VM_clientcommand: %s: invalid client !\n", PRVM_NAME);
-
-		return &svs.clients[destclient].message;
-
-	case MSG_ALL:
-		return &sv.reliable_datagram;
-
-	case MSG_INIT:
-		return &sv.signon;
-
-	default:
-		PRVM_ERROR ("WriteDest: bad destination");
-		break;
-	}
-
-	return NULL;
-}
-
-void VM_WriteByte (void)
-{
-	MSG_WriteByte (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0));
-}
-
-void VM_WriteChar (void)
-{
-	MSG_WriteChar (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0));
-}
-
-void VM_WriteShort (void)
-{
-	MSG_WriteShort (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0));
-}
-
-void VM_WriteLong (void)
-{
-	MSG_WriteLong (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0));
-}
-
-void VM_WriteAngle (void)
-{
-	MSG_WriteAngle (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0), sv.protocol);
-}
-
-void VM_WriteCoord (void)
-{
-	MSG_WriteCoord (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0), sv.protocol);
-}
-
-void VM_WriteString (void)
-{
-	MSG_WriteString (VM_WriteDest(), PRVM_G_STRING(OFS_PARM0));
-}
-
-void VM_WriteEntity (void)
-{
-	MSG_WriteShort (VM_WriteDest(), PRVM_G_EDICTNUM(OFS_PARM0));
-}
-
 //=============================================================================
 
 /*
@@ -1420,13 +1206,13 @@ changelevel(string map)
 */
 void VM_changelevel (void)
 {
-	char	*s;
+	const char	*s;
 
 	VM_SAFEPARMCOUNT(1, VM_changelevel);
 
 	if(!sv.active)
 	{
-		Con_Printf("VM_changelevel: game is not server (%s)\n", PRVM_NAME); 
+		Con_Printf("VM_changelevel: game is not server (%s)\n", PRVM_NAME);
 		return;
 	}
 
@@ -1435,7 +1221,7 @@ void VM_changelevel (void)
 		return;
 	svs.changelevel_issued = true;
 
-	s = G_STRING(OFS_PARM0);
+	s = PRVM_G_STRING(OFS_PARM0);
 	Cbuf_AddText (va("changelevel %s\n",s));
 }
 
@@ -1524,7 +1310,7 @@ float	registercvar (string name, string value, float flags)
 */
 void VM_registercvar (void)
 {
-	char *name, *value;
+	const char *name, *value;
 	int	flags;
 
 	VM_SAFEPARMCOUNT(3,VM_registercvar);
@@ -1577,7 +1363,7 @@ void VM_min (void)
 		PRVM_G_FLOAT(OFS_RETURN) = f;
 	}
 	else
-		PRVM_ERROR("VM_min: %s must supply at least 2 floats\n", PRVM_NAME);
+		PRVM_ERROR("VM_min: %s must supply at least 2 floats", PRVM_NAME);
 }
 
 /*
@@ -1604,7 +1390,7 @@ void VM_max (void)
 		PRVM_G_FLOAT(OFS_RETURN) = f;
 	}
 	else
-		PRVM_ERROR("VM_max: %s must supply at least 2 floats\n", PRVM_NAME);
+		PRVM_ERROR("VM_max: %s must supply at least 2 floats", PRVM_NAME);
 }
 
 /*
@@ -1652,7 +1438,7 @@ void VM_copyentity (void)
 	VM_SAFEPARMCOUNT(2,VM_copyentity);
 	in = PRVM_G_EDICT(OFS_PARM0);
 	out = PRVM_G_EDICT(OFS_PARM1);
-	memcpy(out->v, in->v, prog->progs->entityfields * 4);
+	memcpy(out->fields.vp, in->fields.vp, prog->progs->entityfields * 4);
 }
 
 /*
@@ -1668,10 +1454,10 @@ setcolor(clientent, value)
 {
 	client_t *client;
 	int entnum, i;
-	eval_t *val;
+	prvm_eval_t *val;
 
-	entnum = G_EDICTNUM(OFS_PARM0);
-	i = G_FLOAT(OFS_PARM1);
+	entnum = PRVM_G_EDICTNUM(OFS_PARM0);
+	i = PRVM_G_FLOAT(OFS_PARM1);
 
 	if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
 	{
@@ -1680,11 +1466,11 @@ setcolor(clientent, value)
 	}
 
 	client = svs.clients + entnum-1;
-	if ((val = GETEDICTFIELDVALUE(client->edict, eval_clientcolors)))
+	if ((val = PRVM_GETEDICTFIELDVALUE(client->edict, eval_clientcolors)))
 		val->_float = i;
 	client->colors = i;
 	client->old_colors = i;
-	client->edict->v->team = (i & 15) + 1;
+	client->edict->fields.server->team = (i & 15) + 1;
 
 	MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
 	MSG_WriteByte (&sv.reliable_datagram, entnum - 1);
@@ -1708,6 +1494,21 @@ void VM_Files_CloseAll(void)
 	memset(VM_FILES,0,sizeof(qfile_t*[MAX_VMFILES])); // this should be faster (is it ?)
 }
 
+qfile_t *VM_GetFileHandle( int index )
+{
+	if (index < 0 || index >= MAX_VMFILES)
+	{
+		Con_Printf("VM_GetFileHandle: invalid file handle %i used in %s\n", index, PRVM_NAME);
+		return NULL;
+	}
+	if (VM_FILES[index] == NULL)
+	{
+		Con_Printf("VM_GetFileHandle: no such file handle %i (or file has been closed) in %s\n", index, PRVM_NAME);
+		return NULL;
+	}
+	return VM_FILES[index];
+}
+
 /*
 =========
 VM_fopen
@@ -1721,7 +1522,7 @@ float	fopen(string filename, float mode)
 void VM_fopen(void)
 {
 	int filenum, mode;
-	char *modestring, *filename;
+	const char *modestring, *filename;
 
 	VM_SAFEPARMCOUNT(2,VM_fopen);
 
@@ -1747,29 +1548,28 @@ void VM_fopen(void)
 		modestring = "wb";
 		break;
 	default:
-		Con_Printf("VM_fopen: %s no such mode %i (valid: 0 = read, 1 = append, 2 = write)\n", PRVM_NAME, mode);
+		Con_Printf("VM_fopen: %s: no such mode %i (valid: 0 = read, 1 = append, 2 = write)\n", PRVM_NAME, mode);
 		PRVM_G_FLOAT(OFS_RETURN) = -3;
 		return;
 	}
 	filename = PRVM_G_STRING(OFS_PARM0);
-	// .. is parent directory on many platforms
-	// / is parent directory on Amiga
-	// : is root of drive on Amiga (also used as a directory separator on Mac, but / works there too, so that's a bad idea)
-	// \ is a windows-ism (so it's naughty to use it, / works on all platforms)
-	if ((filename[0] == '.' && filename[1] == '.') || filename[0] == '/' || strrchr(filename, ':') || strrchr(filename, '\\'))
-	{
-		Con_Printf("VM_fopen: %s dangerous or non-portable filename \"%s\" not allowed. (contains : or \\ or begins with .. or /)\n", PRVM_NAME, filename);
-		PRVM_G_FLOAT(OFS_RETURN) = -4;
-		return;
-	}
-	VM_FILES[filenum] = FS_Open(va("data/%s", filename), modestring, false);
+
+	VM_FILES[filenum] = FS_Open(va("data/%s", filename), modestring, false, false);
 	if (VM_FILES[filenum] == NULL && mode == 0)
-		VM_FILES[filenum] = FS_Open(va("%s", filename), modestring, false);
+		VM_FILES[filenum] = FS_Open(va("%s", filename), modestring, false, false);
 
 	if (VM_FILES[filenum] == NULL)
+	{
+		if (developer.integer)
+			Con_Printf("VM_fopen: %s: %s mode %s failed\n", PRVM_NAME, filename, modestring);
 		PRVM_G_FLOAT(OFS_RETURN) = -1;
+	}
 	else
+	{
+		if (developer.integer)
+			Con_Printf("VM_fopen: %s: %s mode %s opened as #%i\n", PRVM_NAME, filename, modestring, filenum);
 		PRVM_G_FLOAT(OFS_RETURN) = filenum;
+	}
 }
 
 /*
@@ -1797,6 +1597,8 @@ void VM_fclose(void)
 		Con_Printf("VM_fclose: no such file handle %i (or file has been closed) in %s\n", filenum, PRVM_NAME);
 		return;
 	}
+	if (developer.integer)
+		Con_Printf("VM_fclose: %s: #%i closed\n", PRVM_NAME, filenum);
 	FS_Close(VM_FILES[filenum]);
 	VM_FILES[filenum] = NULL;
 }
@@ -1840,11 +1642,15 @@ void VM_fgets(void)
 	string[end] = 0;
 	// remove \n following \r
 	if (c == '\r')
+	{
 		c = FS_Getc(VM_FILES[filenum]);
-	if (developer.integer)
+		if (c != '\n')
+			FS_UnGetc(VM_FILES[filenum], (unsigned char)c);
+	}
+	if (developer.integer >= 3)
 		Con_Printf("fgets: %s: %s\n", PRVM_NAME, string);
 	if (c >= 0 || end)
-		PRVM_G_INT(OFS_RETURN) = PRVM_SetString(string);
+		PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(string);
 	else
 		PRVM_G_INT(OFS_RETURN) = 0;
 }
@@ -1877,7 +1683,7 @@ void VM_fputs(void)
 		return;
 	}
 	VM_VarString(1, string, sizeof(string));
-	if ((stringlength = strlen(string)))
+	if ((stringlength = (int)strlen(string)))
 		FS_Write(VM_FILES[filenum], string, stringlength);
 	if (developer.integer)
 		Con_Printf("fputs: %s: %s\n", PRVM_NAME, string);
@@ -1893,7 +1699,7 @@ float	strlen(string s)
 //float(string s) strlen = #114; // returns how many characters are in a string
 void VM_strlen(void)
 {
-	char *s;
+	const char *s;
 
 	VM_SAFEPARMCOUNT(1,VM_strlen);
 
@@ -1918,12 +1724,12 @@ void VM_strcat(void)
 {
 	char *s;
 
-	if(prog->argc < 1) 
-		PRVM_ERROR("VM_strcat wrong parameter count (min. 1 expected ) !\n");
-	
+	if(prog->argc < 1)
+		PRVM_ERROR("VM_strcat wrong parameter count (min. 1 expected ) !");
+
 	s = VM_GetTempString();
 	VM_VarString(0, s, VM_STRINGTEMP_LENGTH);
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetString(s);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(s);
 }
 
 /*
@@ -1938,7 +1744,8 @@ string	substring(string s, float start, float length)
 void VM_substring(void)
 {
 	int i, start, length;
-	char *s, *string;
+	const char *s;
+	char *string;
 
 	VM_SAFEPARMCOUNT(3,VM_substring);
 
@@ -1952,7 +1759,7 @@ void VM_substring(void)
 	for (i = 0;i < VM_STRINGTEMP_LENGTH - 1 && *s && i < length;i++, s++)
 		string[i] = *s;
 	string[i] = 0;
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetString(string);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(string);
 }
 
 /*
@@ -1980,17 +1787,17 @@ VM_strzone
 string	strzone(string s)
 =========
 */
-//string(string s) strzone = #118; // makes a copy of a string into the string zone and returns it, this is often used to keep around a tempstring for longer periods of time (tempstrings are replaced often)
+//string(string s, ...) strzone = #118; // makes a copy of a string into the string zone and returns it, this is often used to keep around a tempstring for longer periods of time (tempstrings are replaced often)
 void VM_strzone(void)
 {
-	char *in, *out;
+	char *out;
+	char string[VM_STRINGTEMP_LENGTH];
 
 	VM_SAFEPARMCOUNT(1,VM_strzone);
 
-	in = PRVM_G_STRING(OFS_PARM0);
-	out = Mem_Alloc(VM_STRINGS_MEMPOOL, strlen(in) + 1);
-	strcpy(out, in);
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetString(out);
+	VM_VarString(0, string, sizeof(string));
+	PRVM_G_INT(OFS_RETURN) = PRVM_AllocString(strlen(string) + 1, &out);
+	strcpy(out, string);
 }
 
 /*
@@ -2003,14 +1810,8 @@ strunzone(string s)
 //void(string s) strunzone = #119; // removes a copy of a string from the string zone (you can not use that string again or it may crash!!!)
 void VM_strunzone(void)
 {
-	char *str;
 	VM_SAFEPARMCOUNT(1,VM_strunzone);
-
-	str = PRVM_G_STRING(OFS_PARM0);
-	if( developer.integer && !Mem_IsAllocated( VM_STRINGS_MEMPOOL, str ) )
-		PRVM_ERROR( "VM_strunzone: Zone string already freed in %s!", PRVM_NAME );
-	else
-		Mem_Free( str );
+	PRVM_FreeString(PRVM_G_INT(OFS_PARM0));
 }
 
 /*
@@ -2050,51 +1851,38 @@ VM_tokenize
 float tokenize(string s)
 =========
 */
-//float(string s) tokenize = #441;
-// takes apart a string into individal words (access them with argv), returns how many
-// this function originally written by KrimZon, made shorter by LordHavoc
-static char **tokens = NULL;
-static int    max_tokens, num_tokens = 0;
+//float(string s) tokenize = #441; // takes apart a string into individal words (access them with argv), returns how many
+//this function originally written by KrimZon, made shorter by LordHavoc
+//20040203: rewritten by LordHavoc (no longer uses allocations)
+int num_tokens = 0;
+char *tokens[256], tokenbuf[MAX_INPUTLINE];
 void VM_tokenize (void)
 {
+	size_t pos;
 	const char *p;
-	char *str;
 
 	VM_SAFEPARMCOUNT(1,VM_tokenize);
 
-	str = PRVM_G_STRING(OFS_PARM0);
+	p = PRVM_G_STRING(OFS_PARM0);
 
-	if (tokens != NULL)
+	num_tokens = 0;
+	pos = 0;
+	while(COM_ParseToken(&p, false))
 	{
-		int i;
-		for (i=0;i<num_tokens;i++)
-			Z_Free(tokens[i]);
-		Z_Free(tokens);
-		num_tokens = 0;
+		if (num_tokens >= (int)(sizeof(tokens)/sizeof(tokens[0])))
+			break;
+		if (pos + strlen(com_token) + 1 > sizeof(tokenbuf))
+			break;
+		tokens[num_tokens++] = tokenbuf + pos;
+		strcpy(tokenbuf + pos, com_token);
+		pos += strlen(com_token) + 1;
 	}
 
-	tokens = Z_Malloc(strlen(str) * sizeof(char *));
-	max_tokens = strlen(str);
+	PRVM_G_FLOAT(OFS_RETURN) = num_tokens;
+}
 
-	for (p = str;COM_ParseToken(&p, false) && num_tokens < max_tokens;num_tokens++)
-	{
-		tokens[num_tokens] = Z_Malloc(strlen(com_token) + 1);
-		strcpy(tokens[num_tokens], com_token);
-	}
-
-	PRVM_G_FLOAT(OFS_RETURN) = num_tokens;
-}
-
-/*
-=========
-VM_argv
-
-string argv(float n)
-=========
-*/
-//string(float n) argv = #442;
-// returns a word from the tokenized string (returns nothing for an invalid index)
-// this function originally written by KrimZon, made shorter by LordHavoc
+//string(float n) argv = #442; // returns a word from the tokenized string (returns nothing for an invalid index)
+//this function originally written by KrimZon, made shorter by LordHavoc
 void VM_argv (void)
 {
 	int token_num;
@@ -2102,53 +1890,54 @@ void VM_argv (void)
 	VM_SAFEPARMCOUNT(1,VM_argv);
 
 	token_num = PRVM_G_FLOAT(OFS_PARM0);
+
 	if (token_num >= 0 && token_num < num_tokens)
-		PRVM_G_INT(OFS_RETURN) = PRVM_SetString(tokens[token_num]);
+		PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(tokens[token_num]);
 	else
-		PRVM_G_INT(OFS_RETURN) = PRVM_SetString("");
+		PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(NULL);
 }
 
 /*
 //void(entity e, entity tagentity, string tagname) setattachment = #443; // attachs e to a tag on tagentity (note: use "" to attach to entity origin/angles instead of a tag)
 void PF_setattachment (void)
 {
-	edict_t *e = G_EDICT(OFS_PARM0);
-	edict_t *tagentity = G_EDICT(OFS_PARM1);
-	char *tagname = G_STRING(OFS_PARM2);
-	eval_t *v;
+	prvm_edict_t *e = PRVM_G_EDICT(OFS_PARM0);
+	prvm_edict_t *tagentity = PRVM_G_EDICT(OFS_PARM1);
+	char *tagname = PRVM_G_STRING(OFS_PARM2);
+	prvm_eval_t *v;
 	int i, modelindex;
 	model_t *model;
 
 	if (tagentity == NULL)
-		tagentity = sv.edicts;
+		tagentity = prog->edicts;
 
-	v = GETEDICTFIELDVALUE(e, eval_tag_entity);
+	v = PRVM_GETEDICTFIELDVALUE(e, eval_tag_entity);
 	if (v)
-		v->edict = EDICT_TO_PROG(tagentity);
+		fields.server->edict = PRVM_EDICT_TO_PROG(tagentity);
 
-	v = GETEDICTFIELDVALUE(e, eval_tag_index);
+	v = PRVM_GETEDICTFIELDVALUE(e, eval_tag_index);
 	if (v)
-		v->_float = 0;
-	if (tagentity != NULL && tagentity != sv.edicts && tagname && tagname[0])
+		fields.server->_float = 0;
+	if (tagentity != NULL && tagentity != prog->edicts && tagname && tagname[0])
 	{
-		modelindex = (int)tagentity->v->modelindex;
+		modelindex = (int)tagentity->fields.server->modelindex;
 		if (modelindex >= 0 && modelindex < MAX_MODELS)
 		{
 			model = sv.models[modelindex];
-			if (model->data_overridetagnamesforskin && (unsigned int)tagentity->v->skin < (unsigned int)model->numskins && model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames)
-				for (i = 0;i < model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames;i++)
-					if (!strcmp(tagname, model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].data_overridetagnames[i].name))
-						v->_float = i + 1;
+			if (model->data_overridetagnamesforskin && (unsigned int)tagentity->fields.server->skin < (unsigned int)model->numskins && model->data_overridetagnamesforskin[(unsigned int)tagentity->fields.server->skin].num_overridetagnames)
+				for (i = 0;i < model->data_overridetagnamesforskin[(unsigned int)tagentity->fields.server->skin].num_overridetagnames;i++)
+					if (!strcmp(tagname, model->data_overridetagnamesforskin[(unsigned int)tagentity->fields.server->skin].data_overridetagnames[i].name))
+						fields.server->_float = i + 1;
 			// FIXME: use a model function to get tag info (need to handle skeletal)
-			if (v->_float == 0 && model->alias.aliasnum_tags)
-				for (i = 0;i < model->alias.aliasnum_tags;i++)
-					if (!strcmp(tagname, model->alias.aliasdata_tags[i].name))
-						v->_float = i + 1;
-			if (v->_float == 0)
-				Con_DPrintf("setattachment(edict %i, edict %i, string \"%s\"): tried to find tag named \"%s\" on entity %i (model \"%s\") but could not find it\n", NUM_FOR_EDICT(e), NUM_FOR_EDICT(tagentity), tagname, tagname, NUM_FOR_EDICT(tagentity), model->name);
+			if (fields.server->_float == 0 && model->num_tags)
+				for (i = 0;i < model->num_tags;i++)
+					if (!strcmp(tagname, model->data_tags[i].name))
+						fields.server->_float = i + 1;
+			if (fields.server->_float == 0)
+				Con_DPrintf("setattachment(edict %i, edict %i, string \"%s\"): tried to find tag named \"%s\" on entity %i (model \"%s\") but could not find it\n", PRVM_NUM_FOR_EDICT(e), PRVM_NUM_FOR_EDICT(tagentity), tagname, tagname, PRVM_NUM_FOR_EDICT(tagentity), model->name);
 		}
 		else
-			Con_DPrintf("setattachment(edict %i, edict %i, string \"%s\"): tried to find tag named \"%s\" on entity %i but it has no model\n", NUM_FOR_EDICT(e), NUM_FOR_EDICT(tagentity), tagname, tagname, NUM_FOR_EDICT(tagentity));
+			Con_DPrintf("setattachment(edict %i, edict %i, string \"%s\"): tried to find tag named \"%s\" on entity %i but it has no model\n", PRVM_NUM_FOR_EDICT(e), PRVM_NUM_FOR_EDICT(tagentity), tagname, tagname, PRVM_NUM_FOR_EDICT(tagentity));
 	}
 }*/
 
@@ -2231,9 +2020,9 @@ void VM_getmousepos(void)
 {
 
 	VM_SAFEPARMCOUNT(0,VM_getmousepos);
-	
-	PRVM_G_VECTOR(OFS_RETURN)[0] = in_mouse_x;
-	PRVM_G_VECTOR(OFS_RETURN)[1] = in_mouse_y;
+
+	PRVM_G_VECTOR(OFS_RETURN)[0] = in_mouse_x * vid_conwidth.integer / vid.width;
+	PRVM_G_VECTOR(OFS_RETURN)[1] = in_mouse_y * vid_conheight.integer / vid.height;
 	PRVM_G_VECTOR(OFS_RETURN)[2] = 0;
 }
 
@@ -2267,28 +2056,28 @@ void VM_loadfromdata(void)
 
 /*
 ========================
-VM_M_parseentitydata
+VM_parseentitydata
 
 parseentitydata(entity ent, string data)
 ========================
 */
-void VM_M_parseentitydata(void)
+void VM_parseentitydata(void)
 {
 	prvm_edict_t *ent;
 	const char *data;
 
 	VM_SAFEPARMCOUNT(2, VM_parseentitydata);
-    
+
     // get edict and test it
 	ent = PRVM_G_EDICT(OFS_PARM0);
-	if (ent->p.e->free)
-		PRVM_ERROR ("VM_parseentitydata: %s: Can only set already spawned entities (entity %i is free)!\n", PRVM_NAME, PRVM_NUM_FOR_EDICT(ent));
+	if (ent->priv.required->free)
+		PRVM_ERROR ("VM_parseentitydata: %s: Can only set already spawned entities (entity %i is free)!", PRVM_NAME, PRVM_NUM_FOR_EDICT(ent));
 
 	data = PRVM_G_STRING(OFS_PARM1);
 
     // parse the opening brace
 	if (!COM_ParseToken(&data, false) || com_token[0] != '{' )
-		PRVM_ERROR ("VM_parseentitydata: %s: Couldn't parse entity data:\n%s\n", PRVM_NAME, data );
+		PRVM_ERROR ("VM_parseentitydata: %s: Couldn't parse entity data:\n%s", PRVM_NAME, data );
 
 	PRVM_ED_ParseEdict (data, ent);
 }
@@ -2302,11 +2091,11 @@ loadfromfile(string file)
 */
 void VM_loadfromfile(void)
 {
-	char *filename;
-	qbyte *data;
-	
+	const char *filename;
+	char *data;
+
 	VM_SAFEPARMCOUNT(1,VM_loadfromfile);
-	
+
 	filename = PRVM_G_STRING(OFS_PARM0);
 	// .. is parent directory on many platforms
 	// / is parent directory on Amiga
@@ -2320,10 +2109,10 @@ void VM_loadfromfile(void)
 	}
 
 	// not conform with VM_fopen
-	data = FS_LoadFile(filename, tempmempool, false);
+	data = (char *)FS_LoadFile(filename, tempmempool, false, NULL);
 	if (data == NULL)
 		PRVM_G_FLOAT(OFS_RETURN) = -1;
-	
+
 	PRVM_ED_LoadFromFile(data);
 
 	if(data)
@@ -2374,7 +2163,7 @@ float search_begin(string pattern, float caseinsensitive, float quiet)
 void VM_search_begin(void)
 {
 	int handle;
-	char *pattern;
+	const char *pattern;
 	int caseinsens, quiet;
 
 	VM_SAFEPARMCOUNT(3, VM_search_begin);
@@ -2385,7 +2174,7 @@ void VM_search_begin(void)
 
 	caseinsens = PRVM_G_FLOAT(OFS_PARM1);
 	quiet = PRVM_G_FLOAT(OFS_PARM2);
-	
+
 	for(handle = 0; handle < MAX_VMSEARCHES; handle++)
 		if(!VM_SEARCHLIST[handle])
 			break;
@@ -2416,7 +2205,7 @@ void VM_search_end(void)
 	VM_SAFEPARMCOUNT(1, VM_search_end);
 
 	handle = PRVM_G_FLOAT(OFS_PARM0);
-	
+
 	if(handle < 0 || handle >= MAX_VMSEARCHES)
 	{
 		Con_Printf("VM_search_end: invalid handle %i used in %s\n", handle, PRVM_NAME);
@@ -2456,7 +2245,7 @@ void VM_search_getsize(void)
 		Con_Printf("VM_search_getsize: no such handle %i in %s\n", handle, PRVM_NAME);
 		return;
 	}
-	
+
 	PRVM_G_FLOAT(OFS_RETURN) = VM_SEARCHLIST[handle]->numfilenames;
 }
 
@@ -2491,11 +2280,11 @@ void VM_search_getfilename(void)
 		Con_Printf("VM_search_getfilename: invalid filenum %i in %s\n", filenum, PRVM_NAME);
 		return;
 	}
-	
+
 	tmp = VM_GetTempString();
 	strcpy(tmp, VM_SEARCHLIST[handle]->filenames[filenum]);
 
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetString(tmp);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(tmp);
 }
 
 /*
@@ -2514,7 +2303,7 @@ void VM_chr(void)
 	tmp[0] = (unsigned char) PRVM_G_FLOAT(OFS_PARM0);
 	tmp[1] = 0;
 
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetString(tmp);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(tmp);
 }
 
 //=============================================================================
@@ -2531,7 +2320,7 @@ void VM_iscachedpic(void)
 {
 	VM_SAFEPARMCOUNT(1,VM_iscachedpic);
 
-	// drawq hasnt such a function, thus always return true 
+	// drawq hasnt such a function, thus always return true
 	PRVM_G_FLOAT(OFS_RETURN) = false;
 }
 
@@ -2539,25 +2328,26 @@ void VM_iscachedpic(void)
 =========
 VM_precache_pic
 
-string	precache_pic(string pic) 
+string	precache_pic(string pic)
 =========
 */
 void VM_precache_pic(void)
 {
-	char	*s;
-	
+	const char	*s;
+
 	VM_SAFEPARMCOUNT(1, VM_precache_pic);
-	
+
 	s = PRVM_G_STRING(OFS_PARM0);
 	PRVM_G_INT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0);
-	
+
 	if(!s)
-		PRVM_ERROR ("VM_precache_pic: %s: NULL\n", PRVM_NAME);
+		PRVM_ERROR ("VM_precache_pic: %s: NULL", PRVM_NAME);
 
 	VM_CheckEmptyString (s);
-	
-	if(!Draw_CachePic(s))
-		PRVM_G_INT(OFS_RETURN) = PRVM_SetString(""); 
+
+	// AK Draw_CachePic is supposed to always return a valid pointer
+	if( Draw_CachePic(s, false)->tex == r_texture_notexture )
+		PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(NULL);
 }
 
 /*
@@ -2569,17 +2359,17 @@ freepic(string s)
 */
 void VM_freepic(void)
 {
-	char *s;
+	const char *s;
 
 	VM_SAFEPARMCOUNT(1,VM_freepic);
 
 	s = PRVM_G_STRING(OFS_PARM0);
-	
+
 	if(!s)
-		PRVM_ERROR ("VM_freepic: %s: NULL\n");
-	
+		PRVM_ERROR ("VM_freepic: %s: NULL");
+
 	VM_CheckEmptyString (s);
-	
+
 	Draw_FreePic(s);
 }
 
@@ -2604,21 +2394,21 @@ void VM_drawcharacter(void)
 		PRVM_G_FLOAT(OFS_RETURN) = -1;
 		return;
 	}
-	
+
 	pos = PRVM_G_VECTOR(OFS_PARM0);
 	scale = PRVM_G_VECTOR(OFS_PARM2);
 	rgb = PRVM_G_VECTOR(OFS_PARM3);
 	flag = (int)PRVM_G_FLOAT(OFS_PARM5);
-	
+
 	if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
 	{
 		Con_Printf("VM_drawcharacter: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
 		PRVM_G_FLOAT(OFS_RETURN) = -2;
 		return;
 	}
-	
+
 	if(pos[2] || scale[2])
-		Con_Printf("VM_drawcharacter: z value%c from %s discarded\n",(pos[2] && scale[2]) ? 's' : 0,((pos[2] && scale[2]) ? "pos and scale" : (pos[2] ? "pos" : "scale"))); 
+		Con_Printf("VM_drawcharacter: z value%c from %s discarded\n",(pos[2] && scale[2]) ? 's' : 0,((pos[2] && scale[2]) ? "pos and scale" : (pos[2] ? "pos" : "scale")));
 
 	if(!scale[0] || !scale[1])
 	{
@@ -2629,7 +2419,7 @@ void VM_drawcharacter(void)
 
 	DrawQ_String (pos[0], pos[1], &character, 1, scale[0], scale[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag);
 	PRVM_G_FLOAT(OFS_RETURN) = 1;
-}	
+}
 
 /*
 =========
@@ -2641,10 +2431,10 @@ float	drawstring(vector position, string text, vector scale, vector rgb, float a
 void VM_drawstring(void)
 {
 	float *pos,*scale,*rgb;
-	char  *string;
+	const char  *string;
 	int flag;
 	VM_SAFEPARMCOUNT(6,VM_drawstring);
-	
+
 	string = PRVM_G_STRING(OFS_PARM1);
 	if(!string)
 	{
@@ -2652,21 +2442,21 @@ void VM_drawstring(void)
 		PRVM_G_FLOAT(OFS_RETURN) = -1;
 		return;
 	}
-	
-	//VM_CheckEmptyString(string); Why should it be checked - perhaps the menu wants to the precolored letters, too?
-	
+
+	//VM_CheckEmptyString(string); Why should it be checked - perhaps the menu wants to support the precolored letters, too?
+
 	pos = PRVM_G_VECTOR(OFS_PARM0);
 	scale = PRVM_G_VECTOR(OFS_PARM2);
 	rgb = PRVM_G_VECTOR(OFS_PARM3);
 	flag = (int)PRVM_G_FLOAT(OFS_PARM5);
-	
+
 	if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
 	{
 		Con_Printf("VM_drawstring: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
 		PRVM_G_FLOAT(OFS_RETURN) = -2;
 		return;
 	}
-	
+
 	if(!scale[0] || !scale[1])
 	{
 		Con_Printf("VM_drawstring: scale %s is null !\n", (scale[0] == 0) ? ((scale[1] == 0) ? "x and y" : "x") : "y");
@@ -2675,8 +2465,8 @@ void VM_drawstring(void)
 	}
 
 	if(pos[2] || scale[2])
-		Con_Printf("VM_drawstring: z value%c from %s discarded\n",(pos[2] && scale[2]) ? 's' : 0,((pos[2] && scale[2]) ? "pos and scale" : (pos[2] ? "pos" : "scale"))); 
-	
+		Con_Printf("VM_drawstring: z value%c from %s discarded\n",(pos[2] && scale[2]) ? 's' : 0,((pos[2] && scale[2]) ? "pos and scale" : (pos[2] ? "pos" : "scale")));
+
 	DrawQ_String (pos[0], pos[1], string, 0, scale[0], scale[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag);
 	PRVM_G_FLOAT(OFS_RETURN) = 1;
 }
@@ -2689,7 +2479,7 @@ float	drawpic(vector position, string pic, vector size, vector rgb, float alpha,
 */
 void VM_drawpic(void)
 {
-	char *pic;
+	const char *pic;
 	float *size, *pos, *rgb;
 	int flag;
 
@@ -2700,7 +2490,7 @@ void VM_drawpic(void)
 	if(!pic)
 	{
 		Con_Printf("VM_drawpic: %s passed null picture name !\n", PRVM_NAME);
-		PRVM_G_FLOAT(OFS_RETURN) = -1;	
+		PRVM_G_FLOAT(OFS_RETURN) = -1;
 		return;
 	}
 
@@ -2713,7 +2503,7 @@ void VM_drawpic(void)
 		PRVM_G_FLOAT(OFS_RETURN) = -4;
 		return;
 	}
-	
+
 	pos = PRVM_G_VECTOR(OFS_PARM0);
 	size = PRVM_G_VECTOR(OFS_PARM2);
 	rgb = PRVM_G_VECTOR(OFS_PARM3);
@@ -2727,8 +2517,8 @@ void VM_drawpic(void)
 	}
 
 	if(pos[2] || size[2])
-		Con_Printf("VM_drawstring: z value%c from %s discarded\n",(pos[2] && size[2]) ? 's' : 0,((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size"))); 
-	
+		Con_Printf("VM_drawstring: z value%c from %s discarded\n",(pos[2] && size[2]) ? 's' : 0,((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size")));
+
 	DrawQ_Pic(pos[0], pos[1], pic, size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag);
 	PRVM_G_FLOAT(OFS_RETURN) = 1;
 }
@@ -2744,25 +2534,25 @@ void VM_drawfill(void)
 {
 	float *size, *pos, *rgb;
 	int flag;
-	
+
 	VM_SAFEPARMCOUNT(5,VM_drawfill);
-	
-	
+
+
 	pos = PRVM_G_VECTOR(OFS_PARM0);
 	size = PRVM_G_VECTOR(OFS_PARM1);
 	rgb = PRVM_G_VECTOR(OFS_PARM2);
 	flag = (int) PRVM_G_FLOAT(OFS_PARM4);
-	
+
 	if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
 	{
 		Con_Printf("VM_drawstring: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
 		PRVM_G_FLOAT(OFS_RETURN) = -2;
 		return;
 	}
-	
+
 	if(pos[2] || size[2])
-		Con_Printf("VM_drawstring: z value%c from %s discarded\n",(pos[2] && size[2]) ? 's' : 0,((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size"))); 
-	
+		Con_Printf("VM_drawstring: z value%c from %s discarded\n",(pos[2] && size[2]) ? 's' : 0,((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size")));
+
 	DrawQ_Pic(pos[0], pos[1], 0, size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM3), flag);
 	PRVM_G_FLOAT(OFS_RETURN) = 1;
 }
@@ -2779,10 +2569,10 @@ void VM_drawsetcliparea(void)
 	float x,y,w,h;
 	VM_SAFEPARMCOUNT(4,VM_drawsetcliparea);
 
-	x = bound(0, PRVM_G_FLOAT(OFS_PARM0), vid.conwidth);
-	y = bound(0, PRVM_G_FLOAT(OFS_PARM1), vid.conheight);
-	w = bound(0, PRVM_G_FLOAT(OFS_PARM2) + PRVM_G_FLOAT(OFS_PARM0) - x, (vid.conwidth  - x));
-	h = bound(0, PRVM_G_FLOAT(OFS_PARM3) + PRVM_G_FLOAT(OFS_PARM1) - y, (vid.conheight - y)); 
+	x = bound(0, PRVM_G_FLOAT(OFS_PARM0), vid_conwidth.integer);
+	y = bound(0, PRVM_G_FLOAT(OFS_PARM1), vid_conheight.integer);
+	w = bound(0, PRVM_G_FLOAT(OFS_PARM2) + PRVM_G_FLOAT(OFS_PARM0) - x, (vid_conwidth.integer  - x));
+	h = bound(0, PRVM_G_FLOAT(OFS_PARM3) + PRVM_G_FLOAT(OFS_PARM1) - y, (vid_conheight.integer - y));
 
 	DrawQ_SetClipArea(x, y, w, h);
 }
@@ -2810,19 +2600,19 @@ vector	getimagesize(string pic)
 */
 void VM_getimagesize(void)
 {
-	char *p;
+	const char *p;
 	cachepic_t *pic;
 
 	VM_SAFEPARMCOUNT(1,VM_getimagesize);
-	
+
 	p = PRVM_G_STRING(OFS_PARM0);
 
 	if(!p)
-		PRVM_ERROR("VM_getimagepos: %s passed null picture name !\n", PRVM_NAME);
-	
+		PRVM_ERROR("VM_getimagepos: %s passed null picture name !", PRVM_NAME);
+
 	VM_CheckEmptyString (p);
 
-	pic = Draw_CachePic (p);
+	pic = Draw_CachePic (p, false);
 
 	PRVM_G_VECTOR(OFS_RETURN)[0] = pic->width;
 	PRVM_G_VECTOR(OFS_RETURN)[1] = pic->height;
@@ -2840,11 +2630,11 @@ float cin_open(string file, string name)
 */
 void VM_cin_open( void )
 {
-	char *file;
-	char *name;
-	
+	const char *file;
+	const char *name;
+
 	VM_SAFEPARMCOUNT( 2, VM_cin_open );
-	
+
 	file = PRVM_G_STRING( OFS_PARM0 );
 	name = PRVM_G_STRING( OFS_PARM1 );
 
@@ -2866,14 +2656,14 @@ void cin_close(string name)
 */
 void VM_cin_close( void )
 {
-	char *name;
+	const char *name;
 
 	VM_SAFEPARMCOUNT( 1, VM_cin_close );
 
 	name = PRVM_G_STRING( OFS_PARM0 );
 	VM_CheckEmptyString( name );
 
-	CL_CloseVideo( CL_GetVideo( name ) ); 
+	CL_CloseVideo( CL_GetVideo( name ) );
 }
 
 /*
@@ -2884,7 +2674,7 @@ void cin_setstate(string name, float type)
 */
 void VM_cin_setstate( void )
 {
-	char *name;
+	const char *name;
 	clvideostate_t 	state;
 	clvideo_t		*video;
 
@@ -2893,11 +2683,11 @@ void VM_cin_setstate( void )
 	name = PRVM_G_STRING( OFS_PARM0 );
 	VM_CheckEmptyString( name );
 
-	state = PRVM_G_FLOAT( OFS_PARM1 );
+	state = (clvideostate_t)((int)PRVM_G_FLOAT( OFS_PARM1 ));
 
 	video = CL_GetVideo( name );
 	if( video && state > CLVIDEO_UNUSED && state < CLVIDEO_STATECOUNT )
-		CL_SetVideoState( video, state );		
+		CL_SetVideoState( video, state );
 }
 
 /*
@@ -2909,7 +2699,7 @@ float cin_getstate(string name)
 */
 void VM_cin_getstate( void )
 {
-	char *name;
+	const char *name;
 	clvideo_t		*video;
 
 	VM_SAFEPARMCOUNT( 1, VM_cin_getstate );
@@ -2933,7 +2723,7 @@ void cin_restart(string name)
 */
 void VM_cin_restart( void )
 {
-	char *name;
+	const char *name;
 	clvideo_t		*video;
 
 	VM_SAFEPARMCOUNT( 1, VM_cin_restart );
@@ -2959,19 +2749,23 @@ float altstr_count(string)
 */
 void VM_altstr_count( void )
 {
-	char *altstr, *pos;
+	const char *altstr, *pos;
 	int	count;
 
 	VM_SAFEPARMCOUNT( 1, VM_altstr_count );
 
 	altstr = PRVM_G_STRING( OFS_PARM0 );
-	VM_CheckEmptyString( altstr );
+	//VM_CheckEmptyString( altstr );
 
-	for( count = 0, pos = altstr ; *pos ; pos++ )
-		if( *pos == '\\' && !*++pos )
+	for( count = 0, pos = altstr ; *pos ; pos++ ) {
+		if( *pos == '\\' ) {
+			if( !*++pos ) {
 				break;
-		else if( *pos == '\'' )
+			}
+		} else if( *pos == '\'' ) {
 			count++;
+		}
+	}
 
 	PRVM_G_FLOAT( OFS_RETURN ) = (float) (count / 2);
 }
@@ -2986,13 +2780,13 @@ string altstr_prepare(string)
 void VM_altstr_prepare( void )
 {
 	char *outstr, *out;
-	char *instr, *in;
+	const char *instr, *in;
 	int size;
 
 	VM_SAFEPARMCOUNT( 1, VM_altstr_prepare );
 
 	instr = PRVM_G_STRING( OFS_PARM0 );
-	VM_CheckEmptyString( instr );
+	//VM_CheckEmptyString( instr );
 	outstr = VM_GetTempString();
 
 	for( out = outstr, in = instr, size = VM_STRINGTEMP_LENGTH - 1 ; size && *in ; size--, in++, out++ )
@@ -3004,7 +2798,7 @@ void VM_altstr_prepare( void )
 			*out = *in;
 	*out = 0;
 
-	PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( outstr );
+	PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( outstr );
 }
 
 /*
@@ -3016,25 +2810,27 @@ string altstr_get(string, float)
 */
 void VM_altstr_get( void )
 {
-	char *altstr, *pos, *outstr, *out;
+	const char *altstr, *pos;
+	char *outstr, *out;
 	int count, size;
 
 	VM_SAFEPARMCOUNT( 2, VM_altstr_get );
 
 	altstr = PRVM_G_STRING( OFS_PARM0 );
-	VM_CheckEmptyString( altstr );
+	//VM_CheckEmptyString( altstr );
 
 	count = PRVM_G_FLOAT( OFS_PARM1 );
 	count = count * 2 + 1;
 
 	for( pos = altstr ; *pos && count ; pos++ )
-		if( *pos == '\\' && !*++pos )
-			break;        			
-		else if( *pos == '\'' )
+		if( *pos == '\\' ) {
+			if( !*++pos )
+				break;
+		} else if( *pos == '\'' )
 			count--;
 
 	if( !*pos ) {
-		PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( "" );
+		PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( NULL );
 		return;
 	}
 
@@ -3051,614 +2847,114 @@ void VM_altstr_get( void )
 			*out = *pos;
 
 	*out = 0;
-	PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( outstr );
-}
-
-void VM_Cmd_Init(void)
-{
-	// only init the stuff for the current prog
-	VM_STRINGS_MEMPOOL = Mem_AllocPool(va("vm_stringsmempool[%s]",PRVM_NAME), 0, NULL);
-	VM_Files_Init();
-	VM_Search_Init();
-}
-
-void VM_Cmd_Reset(void)
-{
-	//Mem_EmptyPool(VM_STRINGS_MEMPOOL);
-	if( developer.integer >= 2 && VM_STRINGS_MEMPOOL ) {
-		memheader_t *header;
-		int	i;
-
-		for( i = 0, header = VM_STRINGS_MEMPOOL->chain ; header ; header = header->next, i++ )
-			Con_DPrintf( "Leaked string %i (size: %i): %.*s\n", i, header->size, header->size, ((char*)header) + sizeof( memheader_t ) );
-	}
-
-	Mem_FreePool(&VM_STRINGS_MEMPOOL);
-	CL_PurgeOwner( MENUOWNER );
-	VM_Search_Reset();
-	VM_Files_CloseAll();
-}
-
-//============================================================================
-// Server
-
-char *vm_sv_extensions =
-"";
-
-prvm_builtin_t vm_sv_builtins[] = {
-0  // to be consistent with the old vm
-};
-
-const int vm_sv_numbuiltins = sizeof(vm_sv_builtins) / sizeof(prvm_builtin_t);
-
-void VM_SV_Cmd_Init(void)
-{
-}
-
-void VM_SV_Cmd_Reset(void)
-{
-}
-
-//============================================================================
-// Client
-
-char *vm_cl_extensions =
-"";
-
-prvm_builtin_t vm_cl_builtins[] = {
-0  // to be consistent with the old vm
-};
-
-const int vm_cl_numbuiltins = sizeof(vm_cl_builtins) / sizeof(prvm_builtin_t);
-
-void VM_CL_Cmd_Init(void)
-{
-}
-
-void VM_CL_Cmd_Reset(void)
-{
-}
-
-//============================================================================
-// Menu
-
-char *vm_m_extensions =
-"DP_CINEMATIC_DPV";
-
-/*
-=========
-VM_M_setmousetarget
-
-setmousetarget(float target)
-=========
-*/
-void VM_M_setmousetarget(void)
-{
-	VM_SAFEPARMCOUNT(1, VM_M_setmousetarget);
-
-	switch((int)PRVM_G_FLOAT(OFS_PARM0))
-	{
-	case 1:
-		in_client_mouse = false;
-		break;
-	case 2:
-		in_client_mouse = true;
-		break;
-	default:
-		PRVM_ERROR("VM_M_setmousetarget: wrong destination %i !\n",PRVM_G_FLOAT(OFS_PARM0));
-	}
-}
-
-/*
-=========
-VM_M_getmousetarget
-
-float	getmousetarget
-=========
-*/
-void VM_M_getmousetarget(void)
-{
-	VM_SAFEPARMCOUNT(0,VM_M_getmousetarget);
-
-	if(in_client_mouse)
-		PRVM_G_FLOAT(OFS_RETURN) = 2;
-	else
-		PRVM_G_FLOAT(OFS_RETURN) = 1;
-}
-	
-
-
-/*
-=========
-VM_M_setkeydest
-
-setkeydest(float dest)
-=========
-*/
-void VM_M_setkeydest(void)
-{
-	VM_SAFEPARMCOUNT(1,VM_M_setkeydest);
-
-	switch((int)PRVM_G_FLOAT(OFS_PARM0))
-	{
-	case 0:
-		// key_game
-		key_dest = key_game;
-		break;
-	case 2:
-		// key_menu
-		key_dest = key_menu;
-		break;
-	case 1:
-		// key_message
-		// key_dest = key_message
-		// break;
-	default:
-		PRVM_ERROR("VM_M_setkeydest: wrong destination %i !\n",prog->globals[OFS_PARM0]);
-	}
-}
-
-/*
-=========
-VM_M_getkeydest
-
-float	getkeydest
-=========
-*/
-void VM_M_getkeydest(void)
-{
-	VM_SAFEPARMCOUNT(0,VM_M_getkeydest);
-
-	// key_game = 0, key_message = 1, key_menu = 2, unknown = 3
-	switch(key_dest)
-	{
-	case key_game:
-		PRVM_G_FLOAT(OFS_RETURN) = 0;
-		break;
-	case key_menu:
-		PRVM_G_FLOAT(OFS_RETURN) = 2;
-		break;
-	case key_message:
-		// not supported
-		// PRVM_G_FLOAT(OFS_RETURN) = 1;
-		// break;
-	default:
-		PRVM_G_FLOAT(OFS_RETURN) = 3;
-	}
+	PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( outstr );
 }
 
 /*
-=========
-VM_M_callfunction
+========================
+VM_altstr_set
 
-	callfunction(...,string function_name)
-Extension: pass 
-=========
+string altstr_set(string altstr, float num, string set)
+========================
 */
-mfunction_t *PRVM_ED_FindFunction (const char *name);
-void VM_M_callfunction(void)
+void VM_altstr_set( void )
 {
-	mfunction_t *func;
-	char *s;
-
-	if(prog->argc == 0)
-		PRVM_ERROR("VM_M_callfunction: 1 parameter is required !\n");
-
-	s = PRVM_G_STRING(OFS_PARM0 + (prog->argc - 1));
-
-	if(!s)
-		PRVM_ERROR("VM_M_callfunction: null string !\n");
-
-	VM_CheckEmptyString(s); 
-
-	func = PRVM_ED_FindFunction(s);
-
-	if(!func)
-		PRVM_ERROR("VM_M_callfunciton: function %s not found !\n", s);
-	else if (func->first_statement < 0)
-	{
-		// negative statements are built in functions
-		int builtinnumber = -func->first_statement;
-		prog->xfunction->builtinsprofile++;
-		if (builtinnumber < prog->numbuiltins && prog->builtins[builtinnumber])
-			prog->builtins[builtinnumber]();
-		else
-			PRVM_ERROR("No such builtin #%i in %s", builtinnumber, PRVM_NAME);
-	}
-	else if(func > 0)
-	{
-		prog->argc--;
-		PRVM_ExecuteProgram(func - prog->functions,"");
-		prog->argc++;
-	}
-}	
+    int num;
+	const char *altstr, *str;
+	const char *in;
+	char *outstr, *out;
 
-/*
-=========
-VM_M_isfunction
+	VM_SAFEPARMCOUNT( 3, VM_altstr_set );
 
-float	isfunction(string function_name)
-=========
-*/
-mfunction_t *PRVM_ED_FindFunction (const char *name);
-void VM_M_isfunction(void)
-{
-	mfunction_t *func;
-	char *s;
-	
-	VM_SAFEPARMCOUNT(1, VM_M_isfunction);
-	
-	s = PRVM_G_STRING(OFS_PARM0);
-	
-	if(!s)
-		PRVM_ERROR("VM_M_isfunction: null string !\n");
-	
-	VM_CheckEmptyString(s); 
-	
-	func = PRVM_ED_FindFunction(s);
-
-	if(!func)
-		PRVM_G_FLOAT(OFS_RETURN) = false;
-	else
-		PRVM_G_FLOAT(OFS_RETURN) = true;
-}
+	altstr = PRVM_G_STRING( OFS_PARM0 );
+	//VM_CheckEmptyString( altstr );
 
-/*
-=========
-VM_M_writetofile
+	num = PRVM_G_FLOAT( OFS_PARM1 );
 
-	writetofile(float fhandle, entity ent)
-=========
-*/
-void VM_M_writetofile(void)
-{
-	prvm_edict_t * ent;
-	int filenum;
+	str = PRVM_G_STRING( OFS_PARM2 );
+	//VM_CheckEmptyString( str );
 
-	VM_SAFEPARMCOUNT(2, VM_M_writetofile);
+	outstr = out = VM_GetTempString();
+	for( num = num * 2 + 1, in = altstr; *in && num; *out++ = *in++ )
+		if( *in == '\\' ) {
+			if( !*++in ) {
+				break;
+			}
+		} else if( *in == '\'' ) {
+			num--;
+		}
 
-	filenum = PRVM_G_FLOAT(OFS_PARM0);
-	if (filenum < 0 || filenum >= MAX_VMFILES)
-	{
-		Con_Printf("VM_fputs: invalid file handle %i used in %s\n", filenum, PRVM_NAME);
-		return;
-	}
-	if (VM_FILES[filenum] == NULL)
-	{
-		Con_Printf("VM_fputs: no such file handle %i (or file has been closed) in %s\n", filenum, PRVM_NAME);
+	if( !in ) {
+		PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( altstr );
 		return;
 	}
+	// copy set in
+	for( ; *str; *out++ = *str++ );
+	// now jump over the old content
+	for( ; *in ; in++ )
+		if( *in == '\'' || (*in == '\\' && !*++in) )
+			break;
 
-	ent = PRVM_G_EDICT(OFS_PARM1); 	
-	if(ent->p.e->free)
-	{
-		Con_Printf("VM_M_writetofile: %s: entity %i is free !\n", PRVM_NAME, PRVM_EDICT_NUM(OFS_PARM1));
+	if( !in ) {
+		PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( NULL );
 		return;
 	}
 
-	PRVM_ED_Write (VM_FILES[filenum], ent);
+	strcpy( out, in );
+	PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( outstr );
 }
 
 /*
-=========
-VM_M_getresolution
-
-vector	getresolution(float number)
-=========
+========================
+VM_altstr_ins
+insert after num
+string	altstr_ins(string altstr, float num, string set)
+========================
 */
-extern unsigned short video_resolutions[][2];
-void VM_M_getresolution(void)
+void VM_altstr_ins(void)
 {
-	int nr;
-	VM_SAFEPARMCOUNT(1, VM_getresolution);
-
-	nr = PRVM_G_FLOAT(OFS_PARM0);
+	int num;
+	const char *setstr;
+	const char *set;
+	const char *instr;
+	const char *in;
+	char *outstr;
+	char *out;
 
+	in = instr = PRVM_G_STRING( OFS_PARM0 );
+	num = PRVM_G_FLOAT( OFS_PARM1 );
+	set = setstr = PRVM_G_STRING( OFS_PARM2 );
 
-	PRVM_G_VECTOR(OFS_RETURN)[0] = video_resolutions[nr][0];
-	PRVM_G_VECTOR(OFS_RETURN)[1] = video_resolutions[nr][1];
-	PRVM_G_VECTOR(OFS_RETURN)[2] = 0;	
-}
-
-/*
-=========
-VM_M_keynumtostring
-
-string keynumtostring(float keynum)
-=========
-*/
-void VM_M_keynumtostring(void)
-{
-	int keynum;
-	char *tmp;
-	VM_SAFEPARMCOUNT(1, VM_M_keynumtostring);
-
-	keynum = PRVM_G_FLOAT(OFS_PARM0);
+	out = outstr = VM_GetTempString();
+	for( num = num * 2 + 2 ; *in && num > 0 ; *out++ = *in++ )
+		if( *in == '\\' ) {
+			if( !*++in ) {
+				break;
+			}
+		} else if( *in == '\'' ) {
+			num--;
+		}
 
-	tmp = VM_GetTempString();
-	
-	strcpy(tmp, Key_KeynumToString(keynum));
+	*out++ = '\'';
+	for( ; *set ; *out++ = *set++ );
+	*out++ = '\'';
 
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetString(tmp);
+	strcpy( out, in );
+	PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( outstr );
 }
 
-/*
-=========
-VM_M_findkeysforcommand
-
-string	findkeysforcommand(string command)
-
-the returned string is an altstring
-=========
-*/
-#define NUMKEYS 5 // TODO: merge the constant in keys.c with this one somewhen
-
-void M_FindKeysForCommand(char *command, int *keys);
-void VM_M_findkeysforcommand(void)
+void VM_Cmd_Init(void)
 {
-	char *cmd, *ret;
-	int keys[NUMKEYS];
-	int i;
-
-	VM_SAFEPARMCOUNT(1, VM_M_findkeysforcommand);
-
-	cmd = PRVM_G_STRING(OFS_PARM0);
-	
-	VM_CheckEmptyString(cmd);
-
-	(ret = VM_GetTempString())[0] = 0;
-	
-	M_FindKeysForCommand(cmd, keys);
-
-	for(i = 0; i < NUMKEYS; i++)
-		ret = strcat(ret, va(" \'%i\'", keys[i]));
-
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetString(ret);
+	// only init the stuff for the current prog
+	VM_Files_Init();
+	VM_Search_Init();
 }
 
-/*
-=========
-VM_M_gethostcachecount
-
-float	gethostcachevalue(float type)
-=========
-*/
-/*
-	type:
-0	hostcachecount
-1	masterquerycount
-2	masterreplycount
-3	serverquerycount
-4	serverreplycount
-*/
-void VM_M_gethostcachevalue( void )
+void VM_Cmd_Reset(void)
 {
-	int type;
-	VM_SAFEPARMCOUNT ( 1, VM_M_gethostcachevalue );
-
-	PRVM_G_FLOAT( OFS_RETURN ) = 0;
-
-	type = PRVM_G_FLOAT( OFS_PARM0 );
-	if( type < 0 || type > 4 )
-		Con_Printf( "VM_M_gethostcachevalue: bad type %i!\n", type );
-	else switch(type)
-	{
-	case 0:
-		PRVM_G_FLOAT ( OFS_RETURN ) = hostCacheCount;
-		return;
-	case 1:
-		PRVM_G_FLOAT ( OFS_RETURN ) = masterquerycount;
-		return;
-	case 2:
-		PRVM_G_FLOAT ( OFS_RETURN ) = masterreplycount;
-		return;
-	case 3:
-		PRVM_G_FLOAT ( OFS_RETURN ) = serverquerycount;
-		return;
-	case 4:
-		PRVM_G_FLOAT ( OFS_RETURN ) = serverreplycount;
-		return;
-	}
+	CL_PurgeOwner( MENUOWNER );
+	VM_Search_Reset();
+	VM_Files_CloseAll();
 }
 
-/*
-=========
-VM_M_gethostcachestring
-
-string	gethostcachestring(float type, float hostnr)
-=========
-*/
-/*
-0	Get CName
-1	Get line1
-2	Get line2 
-*/
-void VM_M_gethostcachestring(void)
-{
-	int type;
-	int hostnr;
-
-	VM_SAFEPARMCOUNT(2, VM_M_gethostcachestring);
-
-	PRVM_G_INT(OFS_RETURN) = 0;
-
-	type = PRVM_G_FLOAT(OFS_PARM0);
-	
-	if(type < 0 || type > 2)
-	{
-		Con_Print("VM_M_gethostcachestring: bad string type requested!\n");
-		return;
-	}
-
-	hostnr = PRVM_G_FLOAT(OFS_PARM1);
 
-	if(hostnr < 0 || hostnr >= hostCacheCount)
-	{
-		Con_Print("VM_M_gethostcachestring: bad hostnr passed!\n");
-		return;
-	}
-
-	if( type == 0 )
-		PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( hostcache[hostnr].cname );
-	else if( type == 1 )
-		PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( hostcache[hostnr].line1 );
-	else
-		PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( hostcache[hostnr].line2 );
-}
-
-prvm_builtin_t vm_m_builtins[] = {
-	0, // to be consistent with the old vm
-	// common builtings (mostly)
-	VM_checkextension,
-	VM_error,
-	VM_objerror,
-	VM_print,
-	VM_bprint,
-	VM_sprint,
-	VM_centerprint,
-	VM_normalize,
-	VM_vlen,
-	VM_vectoyaw,	// #10
-	VM_vectoangles,
-	VM_random,
-	VM_localcmd,
-	VM_cvar,
-	VM_cvar_set,
-	VM_dprint,
-	VM_ftos,
-	VM_fabs,
-	VM_vtos,
-	VM_etos,		// 20
-	VM_stof,
-	VM_spawn,
-	VM_remove,
-	VM_find,
-	VM_findfloat,
-	VM_findchain,
-	VM_findchainfloat,
-	VM_precache_file,
-	VM_precache_sound,
-	VM_coredump,	// 30
-	VM_traceon,
-	VM_traceoff,
-	VM_eprint,
-	VM_rint,
-	VM_floor,
-	VM_ceil,
-	VM_nextent,
-	VM_sin,
-	VM_cos,
-	VM_sqrt,		// 40
-	VM_randomvec,
-	VM_registercvar,
-	VM_min,
-	VM_max,
-	VM_bound,
-	VM_pow,
-	VM_copyentity,
-	VM_fopen,
-	VM_fclose,
-	VM_fgets,		// 50
-	VM_fputs,
-	VM_strlen,
-	VM_strcat,
-	VM_substring,
-	VM_stov,
-	VM_strzone,
-	VM_strunzone,
-	VM_tokenize,
-	VM_argv,
-	VM_isserver,	// 60
-	VM_clientcount, 
-	VM_clientstate,	
-	VM_clcommand,
-	VM_changelevel,
-	VM_localsound,	
-	VM_getmousepos,
-	VM_gettime,
-	VM_loadfromdata,
-	VM_loadfromfile,
-	VM_modulo,		// 70
-	VM_str_cvar,	
-	VM_crash,
-	VM_stackdump,	// 73
-	VM_search_begin,
-	VM_search_end,
-	VM_search_getsize,
-	VM_search_getfilename, // 77
-	VM_chr,	
-	VM_itof,
-	VM_ftoi,		// 80
-	VM_itof,		// isString
-	VM_altstr_count,
-	VM_altstr_prepare,
-	VM_altstr_get,	// 84
-	0,0,0,0,0,0,	// 90
-	e10,			// 100
-	e100,			// 200
-	e100,			// 300
-	e100,			// 400
-	// msg functions
-	VM_WriteByte,
-	VM_WriteChar,
-	VM_WriteShort,
-	VM_WriteLong,
-	VM_WriteAngle,
-	VM_WriteCoord,
-	VM_WriteString,
-	VM_WriteEntity,	// 408
-	0,
-	0,				// 410
-	e10,			// 420
-	e10,			// 430
-	e10,			// 440
-	e10,			// 450
-	// draw functions
-	VM_iscachedpic,
-	VM_precache_pic,
-	VM_freepic,
-	VM_drawcharacter,
-	VM_drawstring,
-	VM_drawpic,
-	VM_drawfill,	
-	VM_drawsetcliparea,
-	VM_drawresetcliparea,
-	VM_getimagesize,// 460
-	VM_cin_open,
-	VM_cin_close,
-	VM_cin_setstate,	
-	VM_cin_getstate,
-	VM_cin_restart, // 465
-	0,0,0,0,0,	// 470
-	e10,			// 480
-	e10,			// 490
-	e10,			// 500
-	e100,			// 600
-	// menu functions
-	VM_M_setkeydest,
-	VM_M_getkeydest,
-	VM_M_setmousetarget,
-	VM_M_getmousetarget,
-	VM_M_callfunction,
-	VM_M_writetofile,
-	VM_M_isfunction,
-	VM_M_getresolution,
-	VM_M_keynumtostring,
-	VM_M_findkeysforcommand,// 610
-	VM_M_gethostcachevalue,
-	VM_M_gethostcachestring,
-	VM_M_parseentitydata	// 613
-};
-
-const int vm_m_numbuiltins = sizeof(vm_m_builtins) / sizeof(prvm_builtin_t);
-
-void VM_M_Cmd_Init(void)
-{
-	VM_Cmd_Init();
-}
-
-void VM_M_Cmd_Reset(void)
-{
-	//VM_Cmd_Init();
-	VM_Cmd_Reset();
-}