X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=prvm_cmds.c;h=47e94fe61299bf63ad19ee596590c01606c71dd5;hb=fe0d5dc2d85167fb8042bcb5157e93728e74e53a;hp=f458102c6d39faf1ea085c443dd911781a055bbc;hpb=2b8dbe724670d45a923427ff3a57b4ace5d7ce84;p=xonotic%2Fdarkplaces.git

diff --git a/prvm_cmds.c b/prvm_cmds.c
index f458102c..47e94fe6 100644
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -5,6 +5,7 @@
 // also applies here
 
 #include "prvm_cmds.h"
+#include <time.h>
 
 // LordHavoc: changed this to NOT use a return statement, so that it can be used in functions that must return a value
 void VM_Warning(const char *fmt, ...)
@@ -17,39 +18,18 @@ void VM_Warning(const char *fmt, ...)
 	va_end(argptr);
 
 	Con_Print(msg);
-	PRVM_PrintState();
+	// TODO: either add a cvar/cmd to control the state dumping or replace some of the calls with Con_Printf [9/13/2006 Black]
+	//PRVM_PrintState();
 }
 
 
 //============================================================================
 // Common
 
-// temp string handling
-// LordHavoc: added this to semi-fix the problem of using many ftos calls in a print
-static char vm_string_temp[VM_STRINGTEMP_BUFFERS][VM_STRINGTEMP_LENGTH];
-static int vm_string_tempindex = 0;
-
-// qc file handling
-#define MAX_VMFILES		256
-#define MAX_PRVMFILES	MAX_VMFILES * PRVM_MAXPROGS
-#define VM_FILES ((qfile_t**)(vm_files + PRVM_GetProgNr() * MAX_VMFILES))
-
-qfile_t *vm_files[MAX_PRVMFILES];
-
-// qc fs search handling
-#define MAX_VMSEARCHES 128
-#define TOTAL_VMSEARCHES MAX_VMSEARCHES * PRVM_MAXPROGS
-#define VM_SEARCHLIST ((fssearch_t**)(vm_fssearchlist + PRVM_GetProgNr() * MAX_VMSEARCHES))
-
-fssearch_t *vm_fssearchlist[TOTAL_VMSEARCHES];
-
-char *VM_GetTempString(void)
-{
-	char *s;
-	s = vm_string_temp[vm_string_tempindex];
-	vm_string_tempindex = (vm_string_tempindex + 1) % VM_STRINGTEMP_BUFFERS;
-	return s;
-}
+// TODO DONE: move vm_files and vm_fssearchlist to prvm_prog_t struct
+// TODO: move vm_files and vm_fssearchlist back [9/13/2006 Black]
+// TODO: (move vm_files and vm_fssearchlist to prvm_prog_t struct again) [2007-01-23 LordHavoc]
+// TODO: will this war ever end? [2007-01-23 LordHavoc]
 
 void VM_CheckEmptyString (const char *s)
 {
@@ -132,9 +112,9 @@ void VM_error (void)
 
 	VM_VarString(0, string, sizeof(string));
 	Con_Printf("======%s ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string);
-	if(prog->self)
+	if (prog->globaloffsets.self >= 0)
 	{
-		ed = PRVM_G_EDICT(prog->self->ofs);
+		ed = PRVM_PROG_TO_EDICT(PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict);
 		PRVM_ED_Print(ed);
 	}
 
@@ -157,10 +137,10 @@ void VM_objerror (void)
 	char string[VM_STRINGTEMP_LENGTH];
 
 	VM_VarString(0, string, sizeof(string));
-	Con_Printf("======OBJECT ERROR======\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string);
-	if(prog->self)
+	Con_Printf("======OBJECT ERROR======\n"); // , PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string); // or include them? FIXME
+	if (prog->globaloffsets.self >= 0)
 	{
-		ed = PRVM_G_EDICT (prog->self->ofs);
+		ed = PRVM_PROG_TO_EDICT(PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict);
 		PRVM_ED_Print(ed);
 
 		PRVM_ED_Free (ed);
@@ -173,11 +153,11 @@ void VM_objerror (void)
 
 /*
 =================
-VM_print (actually used only by client and menu)
+VM_print
 
 print to console
 
-print(string)
+print(...[string])
 =================
 */
 void VM_print (void)
@@ -519,25 +499,14 @@ const string	VM_cvar_string (string)
 */
 void VM_cvar_string(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_string: %s: null string", PRVM_NAME);
-
 	VM_CheckEmptyString(name);
 
-	out = VM_GetTempString();
-
-	cvar_string = Cvar_VariableString(name);
-
-	strcpy(out, cvar_string);
-
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(out);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(Cvar_VariableString(name));
 }
 
 
@@ -550,25 +519,14 @@ 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);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(Cvar_VariableDefString(name));
 }
 /*
 =================
@@ -616,18 +574,17 @@ string	ftos(float)
 void VM_ftos (void)
 {
 	float v;
-	char *s;
+	char s[128];
 
 	VM_SAFEPARMCOUNT(1, VM_ftos);
 
 	v = PRVM_G_FLOAT(OFS_PARM0);
 
-	s = VM_GetTempString();
 	if ((float)((int)v) == v)
 		sprintf(s, "%i", (int)v);
 	else
 		sprintf(s, "%f", v);
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(s);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(s);
 }
 
 /*
@@ -658,13 +615,12 @@ string	vtos(vector)
 
 void VM_vtos (void)
 {
-	char *s;
+	char s[512];
 
 	VM_SAFEPARMCOUNT(1,VM_vtos);
 
-	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_SetEngineString(s);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(s);
 }
 
 /*
@@ -677,13 +633,12 @@ string	etos(entity)
 
 void VM_etos (void)
 {
-	char *s;
+	char s[128];
 
 	VM_SAFEPARMCOUNT(1, VM_etos);
 
-	s = VM_GetTempString();
 	sprintf (s, "entity %i", PRVM_G_EDICTNUM(OFS_PARM0));
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(s);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(s);
 }
 
 /*
@@ -715,23 +670,51 @@ void VM_itof(void)
 
 /*
 ========================
-VM_itoe
+VM_ftoe
 
-intt ftoi(float num)
+entity ftoe(float num)
 ========================
 */
-void VM_ftoi(void)
+void VM_ftoe(void)
 {
 	int ent;
-	VM_SAFEPARMCOUNT(1, VM_ftoi);
+	VM_SAFEPARMCOUNT(1, VM_ftoe);
 
 	ent = (int)PRVM_G_FLOAT(OFS_PARM0);
-	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);
+	if (ent < 0 || ent >= MAX_EDICTS || PRVM_PROG_TO_EDICT(ent)->priv.required->free)
+		ent = 0; // return world instead of a free or invalid entity
 
 	PRVM_G_INT(OFS_RETURN) = ent;
 }
 
+/*
+=========
+VM_strftime
+
+string strftime(float uselocaltime, string[, string ...])
+=========
+*/
+void VM_strftime(void)
+{
+	time_t t;
+	struct tm *tm;
+	char fmt[VM_STRINGTEMP_LENGTH];
+	char result[VM_STRINGTEMP_LENGTH];
+	VM_VarString(0, fmt, sizeof(fmt));
+	t = time(NULL);
+	if (PRVM_G_FLOAT(OFS_PARM0))
+		tm = localtime(&t);
+	else
+		tm = gmtime(&t);
+	if (!tm)
+	{
+		PRVM_G_FLOAT(OFS_RETURN) = 0;
+		return;
+	}
+	strftime(result, sizeof(result), fmt, tm);
+	PRVM_G_FLOAT(OFS_RETURN) = PRVM_SetTempString(result);
+}
+
 /*
 =========
 VM_spawn
@@ -806,8 +789,6 @@ void VM_find (void)
 	// LordHavoc: apparently BloodMage does a find(world, weaponmodel, "") and
 	// expects it to find all the monsters, so we must be careful to support
 	// searching for ""
-	if (!s)
-		s = "";
 
 	for (e++ ; e < prog->num_edicts ; e++)
 	{
@@ -879,18 +860,14 @@ void VM_findchain (void)
 {
 	int		i;
 	int		f;
-	int		chain_of;
 	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)
+	if (prog->fieldoffsets.chain < 0)
 		PRVM_ERROR("VM_findchain: %s doesnt have a chain field !", PRVM_NAME);
 
-	chain_of = PRVM_ED_FindField("chain")->ofs;
-
 	chain = prog->edicts;
 
 	f = PRVM_G_INT(OFS_PARM0);
@@ -899,8 +876,6 @@ void VM_findchain (void)
 	// LordHavoc: apparently BloodMage does a find(world, weaponmodel, "") and
 	// expects it to find all the monsters, so we must be careful to support
 	// searching for ""
-	if (!s)
-		s = "";
 
 	ent = PRVM_NEXT_EDICT(prog->edicts);
 	for (i = 1;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent))
@@ -914,7 +889,7 @@ void VM_findchain (void)
 		if (strcmp(t,s))
 			continue;
 
-		PRVM_E_INT(ent,chain_of) = PRVM_NUM_FOR_EDICT(chain);
+		PRVM_EDICTFIELDVALUE(ent,prog->fieldoffsets.chain)->edict = PRVM_NUM_FOR_EDICT(chain);
 		chain = ent;
 	}
 
@@ -935,17 +910,14 @@ void VM_findchainfloat (void)
 {
 	int		i;
 	int		f;
-	int		chain_of;
 	float	s;
 	prvm_edict_t	*ent, *chain;
 
 	VM_SAFEPARMCOUNT(2, VM_findchainfloat);
 
-	if(!prog->flag & PRVM_FE_CHAIN)
+	if (prog->fieldoffsets.chain < 0)
 		PRVM_ERROR("VM_findchainfloat: %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);
@@ -960,7 +932,7 @@ void VM_findchainfloat (void)
 		if (PRVM_E_FLOAT(ent,f) != s)
 			continue;
 
-		PRVM_E_INT(ent,chain_of) = PRVM_EDICT_TO_PROG(chain);
+		PRVM_EDICTFIELDVALUE(ent,prog->fieldoffsets.chain)->edict = PRVM_EDICT_TO_PROG(chain);
 		chain = ent;
 	}
 
@@ -1020,16 +992,13 @@ void VM_findchainflags (void)
 	int		i;
 	int		f;
 	int		s;
-	int		chain_of;
 	prvm_edict_t	*ent, *chain;
 
 	VM_SAFEPARMCOUNT(2, VM_findchainflags);
 
-	if(!prog->flag & PRVM_FE_CHAIN)
+	if (prog->fieldoffsets.chain < 0)
 		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);
@@ -1046,7 +1015,7 @@ void VM_findchainflags (void)
 		if (!((int)PRVM_E_FLOAT(ent,f) & s))
 			continue;
 
-		PRVM_E_INT(ent,chain_of) = PRVM_EDICT_TO_PROG(chain);
+		PRVM_EDICTFIELDVALUE(ent,prog->fieldoffsets.chain)->edict = PRVM_EDICT_TO_PROG(chain);
 		chain = ent;
 	}
 
@@ -1150,15 +1119,14 @@ float	rint(float)
 */
 void VM_rint (void)
 {
-	float	f;
-
+	float f;
 	VM_SAFEPARMCOUNT(1,VM_rint);
 
 	f = PRVM_G_FLOAT(OFS_PARM0);
 	if (f > 0)
-		PRVM_G_FLOAT(OFS_RETURN) = (int)(f + 0.5);
+		PRVM_G_FLOAT(OFS_RETURN) = floor(f + 0.5);
 	else
-		PRVM_G_FLOAT(OFS_RETURN) = (int)(f - 0.5);
+		PRVM_G_FLOAT(OFS_RETURN) = ceil(f - 0.5);
 }
 
 /*
@@ -1233,8 +1201,6 @@ changelevel(string map)
 */
 void VM_changelevel (void)
 {
-	const char	*s;
-
 	VM_SAFEPARMCOUNT(1, VM_changelevel);
 
 	if(!sv.active)
@@ -1248,8 +1214,7 @@ void VM_changelevel (void)
 		return;
 	svs.changelevel_issued = true;
 
-	s = PRVM_G_STRING(OFS_PARM0);
-	Cbuf_AddText (va("changelevel %s\n",s));
+	Cbuf_AddText (va("changelevel %s\n",PRVM_G_STRING(OFS_PARM0)));
 }
 
 /*
@@ -1290,6 +1255,67 @@ void VM_sqrt (void)
 	PRVM_G_FLOAT(OFS_RETURN) = sqrt(PRVM_G_FLOAT(OFS_PARM0));
 }
 
+/*
+=========
+VM_asin
+
+float	asin(float)
+=========
+*/
+void VM_asin (void)
+{
+	VM_SAFEPARMCOUNT(1,VM_asin);
+	PRVM_G_FLOAT(OFS_RETURN) = asin(PRVM_G_FLOAT(OFS_PARM0));
+}
+
+/*
+=========
+VM_acos
+float	acos(float)
+=========
+*/
+void VM_acos (void)
+{
+	VM_SAFEPARMCOUNT(1,VM_acos);
+	PRVM_G_FLOAT(OFS_RETURN) = acos(PRVM_G_FLOAT(OFS_PARM0));
+}
+
+/*
+=========
+VM_atan
+float	atan(float)
+=========
+*/
+void VM_atan (void)
+{
+	VM_SAFEPARMCOUNT(1,VM_atan);
+	PRVM_G_FLOAT(OFS_RETURN) = atan(PRVM_G_FLOAT(OFS_PARM0));
+}
+
+/*
+=========
+VM_atan2
+float	atan2(float,float)
+=========
+*/
+void VM_atan2 (void)
+{
+	VM_SAFEPARMCOUNT(2,VM_atan2);
+	PRVM_G_FLOAT(OFS_RETURN) = atan2(PRVM_G_FLOAT(OFS_PARM0), PRVM_G_FLOAT(OFS_PARM1));
+}
+
+/*
+=========
+VM_tan
+float	tan(float)
+=========
+*/
+void VM_tan (void)
+{
+	VM_SAFEPARMCOUNT(1,VM_tan);
+	PRVM_G_FLOAT(OFS_RETURN) = tan(PRVM_G_FLOAT(OFS_PARM0));
+}
+
 /*
 =================
 VM_randomvec
@@ -1468,72 +1494,37 @@ void VM_copyentity (void)
 	memcpy(out->fields.vp, in->fields.vp, prog->progs->entityfields * 4);
 }
 
-/*
-=================
-VM_setcolor
-
-sets the color of a client and broadcasts the update to all connected clients
-
-setcolor(clientent, value)
-=================
-*/
-/*void PF_setcolor (void)
-{
-	client_t *client;
-	int entnum, i;
-	prvm_eval_t *val;
-
-	entnum = PRVM_G_EDICTNUM(OFS_PARM0);
-	i = PRVM_G_FLOAT(OFS_PARM1);
-
-	if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
-	{
-		Con_Print("tried to setcolor a non-client\n");
-		return;
-	}
-
-	client = svs.clients + entnum-1;
-	if ((val = PRVM_GETEDICTFIELDVALUE(client->edict, eval_clientcolors)))
-		val->_float = i;
-	client->colors = i;
-	client->old_colors = i;
-	client->edict->fields.server->team = (i & 15) + 1;
-
-	MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors);
-	MSG_WriteByte (&sv.reliable_datagram, entnum - 1);
-	MSG_WriteByte (&sv.reliable_datagram, i);
-}*/
-
 void VM_Files_Init(void)
 {
-	memset(VM_FILES, 0, sizeof(qfile_t*[MAX_VMFILES]));
+	int i;
+	for (i = 0;i < PRVM_MAX_OPENFILES;i++)
+		prog->openfiles[i] = NULL;
 }
 
 void VM_Files_CloseAll(void)
 {
 	int i;
-	for (i = 0;i < MAX_VMFILES;i++)
+	for (i = 0;i < PRVM_MAX_OPENFILES;i++)
 	{
-		if (VM_FILES[i])
-			FS_Close(VM_FILES[i]);
-		//VM_FILES[i] = NULL;
+		if (prog->openfiles[i])
+			FS_Close(prog->openfiles[i]);
+		prog->openfiles[i] = NULL;
 	}
-	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)
+	if (index < 0 || index >= PRVM_MAX_OPENFILES)
 	{
 		Con_Printf("VM_GetFileHandle: invalid file handle %i used in %s\n", index, PRVM_NAME);
 		return NULL;
 	}
-	if (VM_FILES[index] == NULL)
+	if (prog->openfiles[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];
+	return prog->openfiles[index];
 }
 
 /*
@@ -1553,13 +1544,13 @@ void VM_fopen(void)
 
 	VM_SAFEPARMCOUNT(2,VM_fopen);
 
-	for (filenum = 0;filenum < MAX_VMFILES;filenum++)
-		if (VM_FILES[filenum] == NULL)
+	for (filenum = 0;filenum < PRVM_MAX_OPENFILES;filenum++)
+		if (prog->openfiles[filenum] == NULL)
 			break;
-	if (filenum >= MAX_VMFILES)
+	if (filenum >= PRVM_MAX_OPENFILES)
 	{
 		PRVM_G_FLOAT(OFS_RETURN) = -2;
-		VM_Warning("VM_fopen: %s ran out of file handles (%i)\n", PRVM_NAME, MAX_VMFILES);
+		VM_Warning("VM_fopen: %s ran out of file handles (%i)\n", PRVM_NAME, PRVM_MAX_OPENFILES);
 		return;
 	}
 	mode = (int)PRVM_G_FLOAT(OFS_PARM1);
@@ -1581,21 +1572,21 @@ void VM_fopen(void)
 	}
 	filename = PRVM_G_STRING(OFS_PARM0);
 
-	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, false);
+	prog->openfiles[filenum] = FS_Open(va("data/%s", filename), modestring, false, false);
+	if (prog->openfiles[filenum] == NULL && mode == 0)
+		prog->openfiles[filenum] = FS_Open(va("%s", filename), modestring, false, false);
 
-	if (VM_FILES[filenum] == NULL)
+	if (prog->openfiles[filenum] == NULL)
 	{
 		PRVM_G_FLOAT(OFS_RETURN) = -1;
-		if (developer.integer >= 10)
+		if (developer.integer >= 100)
 			VM_Warning("VM_fopen: %s: %s mode %s failed\n", PRVM_NAME, filename, modestring);
 	}
 	else
 	{
 		PRVM_G_FLOAT(OFS_RETURN) = filenum;
-		if (developer.integer >= 10)
-			VM_Warning("VM_fopen: %s: %s mode %s opened as #%i\n", PRVM_NAME, filename, modestring, filenum);
+		if (developer.integer >= 100)
+			Con_Printf("VM_fopen: %s: %s mode %s opened as #%i\n", PRVM_NAME, filename, modestring, filenum);
 	}
 }
 
@@ -1614,20 +1605,20 @@ void VM_fclose(void)
 	VM_SAFEPARMCOUNT(1,VM_fclose);
 
 	filenum = (int)PRVM_G_FLOAT(OFS_PARM0);
-	if (filenum < 0 || filenum >= MAX_VMFILES)
+	if (filenum < 0 || filenum >= PRVM_MAX_OPENFILES)
 	{
 		VM_Warning("VM_fclose: invalid file handle %i used in %s\n", filenum, PRVM_NAME);
 		return;
 	}
-	if (VM_FILES[filenum] == NULL)
+	if (prog->openfiles[filenum] == NULL)
 	{
 		VM_Warning("VM_fclose: no such file handle %i (or file has been closed) in %s\n", filenum, PRVM_NAME);
 		return;
 	}
-	FS_Close(VM_FILES[filenum]);
-	VM_FILES[filenum] = NULL;
-	if (developer.integer >= 10)
-		VM_Warning("VM_fclose: %s: #%i closed\n", PRVM_NAME, filenum);
+	FS_Close(prog->openfiles[filenum]);
+	prog->openfiles[filenum] = NULL;
+	if (developer.integer >= 100)
+		Con_Printf("VM_fclose: %s: #%i closed\n", PRVM_NAME, filenum);
 }
 
 /*
@@ -1641,18 +1632,18 @@ string	fgets(float fhandle)
 void VM_fgets(void)
 {
 	int c, end;
-	static char string[VM_STRINGTEMP_LENGTH];
+	char string[VM_STRINGTEMP_LENGTH];
 	int filenum;
 
 	VM_SAFEPARMCOUNT(1,VM_fgets);
 
 	filenum = (int)PRVM_G_FLOAT(OFS_PARM0);
-	if (filenum < 0 || filenum >= MAX_VMFILES)
+	if (filenum < 0 || filenum >= PRVM_MAX_OPENFILES)
 	{
 		VM_Warning("VM_fgets: invalid file handle %i used in %s\n", filenum, PRVM_NAME);
 		return;
 	}
-	if (VM_FILES[filenum] == NULL)
+	if (prog->openfiles[filenum] == NULL)
 	{
 		VM_Warning("VM_fgets: no such file handle %i (or file has been closed) in %s\n", filenum, PRVM_NAME);
 		return;
@@ -1660,7 +1651,7 @@ void VM_fgets(void)
 	end = 0;
 	for (;;)
 	{
-		c = FS_Getc(VM_FILES[filenum]);
+		c = FS_Getc(prog->openfiles[filenum]);
 		if (c == '\r' || c == '\n' || c < 0)
 			break;
 		if (end < VM_STRINGTEMP_LENGTH - 1)
@@ -1670,16 +1661,16 @@ void VM_fgets(void)
 	// remove \n following \r
 	if (c == '\r')
 	{
-		c = FS_Getc(VM_FILES[filenum]);
+		c = FS_Getc(prog->openfiles[filenum]);
 		if (c != '\n')
-			FS_UnGetc(VM_FILES[filenum], (unsigned char)c);
+			FS_UnGetc(prog->openfiles[filenum], (unsigned char)c);
 	}
 	if (developer.integer >= 100)
 		Con_Printf("fgets: %s: %s\n", PRVM_NAME, string);
 	if (c >= 0 || end)
-		PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(string);
+		PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(string);
 	else
-		PRVM_G_INT(OFS_RETURN) = 0;
+		PRVM_G_INT(OFS_RETURN) = OFS_NULL;
 }
 
 /*
@@ -1699,19 +1690,19 @@ void VM_fputs(void)
 	VM_SAFEPARMCOUNT(2,VM_fputs);
 
 	filenum = (int)PRVM_G_FLOAT(OFS_PARM0);
-	if (filenum < 0 || filenum >= MAX_VMFILES)
+	if (filenum < 0 || filenum >= PRVM_MAX_OPENFILES)
 	{
 		VM_Warning("VM_fputs: invalid file handle %i used in %s\n", filenum, PRVM_NAME);
 		return;
 	}
-	if (VM_FILES[filenum] == NULL)
+	if (prog->openfiles[filenum] == NULL)
 	{
 		VM_Warning("VM_fputs: no such file handle %i (or file has been closed) in %s\n", filenum, PRVM_NAME);
 		return;
 	}
 	VM_VarString(1, string, sizeof(string));
 	if ((stringlength = (int)strlen(string)))
-		FS_Write(VM_FILES[filenum], string, stringlength);
+		FS_Write(prog->openfiles[filenum], string, stringlength);
 	if (developer.integer >= 100)
 		Con_Printf("fputs: %s: %s\n", PRVM_NAME, string);
 }
@@ -1726,15 +1717,136 @@ float	strlen(string s)
 //float(string s) strlen = #114; // returns how many characters are in a string
 void VM_strlen(void)
 {
-	const char *s;
-
 	VM_SAFEPARMCOUNT(1,VM_strlen);
 
-	s = PRVM_G_STRING(OFS_PARM0);
-	if (s)
-		PRVM_G_FLOAT(OFS_RETURN) = strlen(s);
-	else
-		PRVM_G_FLOAT(OFS_RETURN) = 0;
+	PRVM_G_FLOAT(OFS_RETURN) = strlen(PRVM_G_STRING(OFS_PARM0));
+}
+
+// DRESK - Decolorized String
+/*
+=========
+VM_strdecolorize
+
+string	strdecolorize(string s)
+=========
+*/
+// string (string s) strdecolorize = #472; // returns the passed in string with color codes stripped
+void VM_strdecolorize(void)
+{
+	char szNewString[VM_STRINGTEMP_LENGTH];
+	const char *szString;
+	size_t nCnt;
+	int nPos;
+	int nFillPos;
+	int bFinished;
+		nPos = 0;
+		nFillPos = 0;
+		nCnt = 0;
+		bFinished = 0;
+
+	// Prepare Strings
+	VM_SAFEPARMCOUNT(1,VM_strdecolorize);
+	szString = PRVM_G_STRING(OFS_PARM0);
+
+	while(!bFinished)
+	{ // Traverse through String
+		if( szString[nPos] == '\n' || szString[nPos] == '\r' || szString[nPos] <= 0)
+		{ // String End Found
+			szNewString[nFillPos++] = szString[nPos];
+			bFinished = 1;
+		}
+		else
+		if( szString[nPos] == STRING_COLOR_TAG)
+		{ // Color Code Located
+			if( szString[nPos + 1] == STRING_COLOR_TAG)
+			{ // Valid Characters to Include
+				szNewString[nFillPos++] = szString[nPos];
+				nPos = nPos + 1;
+				szNewString[nFillPos++] = szString[nPos];
+			}
+			else
+			if( szString[nPos + 1] >= '0' && szString[nPos + 1] <= '9' )
+			{ // Color Code Found; Increment Position
+				nPos = nPos + 1;
+			}
+			else
+			{ // Unknown Color Code; Include
+				szNewString[nFillPos++] = szString[nPos];
+				nPos = nPos + 1;
+			}
+		}
+		else
+			// Include Character
+			szNewString[nFillPos++] = szString[nPos];
+
+			// Increment Position
+			nPos = nPos + 1;
+	}
+
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(szNewString);
+}
+
+// DRESK - String Length (not counting color codes)
+/*
+=========
+VM_strlennocol
+
+float	strlennocol(string s)
+=========
+*/
+// float(string s) strlennocol = #471; // returns how many characters are in a string not including color codes
+// For example, ^2Dresk returns a length of 5
+void VM_strlennocol(void)
+{
+	const char *szString;
+	size_t nCnt;
+	int nPos;
+	int bFinished;
+		nPos = 0;
+		nCnt = 0;
+		bFinished = 0;
+
+	VM_SAFEPARMCOUNT(1,VM_strlennocol);
+
+	szString = PRVM_G_STRING(OFS_PARM0);
+
+	while(!bFinished)
+	{ // Count Characters
+		// SV_BroadcastPrintf("Position '%d'; Character '%c'; Length '%d'\n", nPos, szString[nPos], nCnt);
+
+		if( szString[nPos] == '\n' || szString[nPos] == '\r' || szString[nPos] <= 0)
+		{ // String End Found
+			// SV_BroadcastPrintf("Found End of String at '%d'\n", nPos);
+			bFinished = 1;
+		}
+		else
+		if( szString[nPos] == STRING_COLOR_TAG)
+		{ // Color Code Located
+			if( szString[nPos + 1] == STRING_COLOR_TAG)
+			{ // Increment Length; Skip Color Code
+				nCnt = nCnt + 1;
+				nPos = nPos + 1;
+			}
+			else
+			if( szString[nPos + 1] >= '0' && szString[nPos + 1] <= '9' )
+			{ // Color Code Found; Increment Position
+				// SV_BroadcastPrintf("Found Color Codes at '%d'\n", nPos);
+				nPos = nPos + 1;
+			}
+			else
+			{ // Unknown Color Code; Increment Length!
+				nPos = nPos + 1;
+				nCnt = nCnt + 1;
+			}
+		}
+		else
+			// Increment String Length
+			nCnt = nCnt + 1;
+
+		// Increment Position
+		nPos = nPos + 1;
+	}
+	PRVM_G_FLOAT(OFS_RETURN) = nCnt;
 }
 
 /*
@@ -1749,14 +1861,13 @@ string strcat(string,string,...[string])
 // and returns as a tempstring
 void VM_strcat(void)
 {
-	char *s;
+	char s[VM_STRINGTEMP_LENGTH];
 
 	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_SetEngineString(s);
+	VM_VarString(0, s, sizeof(s));
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(s);
 }
 
 /*
@@ -1772,21 +1883,18 @@ void VM_substring(void)
 {
 	int i, start, length;
 	const char *s;
-	char *string;
+	char string[VM_STRINGTEMP_LENGTH];
 
 	VM_SAFEPARMCOUNT(3,VM_substring);
 
-	string = VM_GetTempString();
 	s = PRVM_G_STRING(OFS_PARM0);
 	start = (int)PRVM_G_FLOAT(OFS_PARM1);
 	length = (int)PRVM_G_FLOAT(OFS_PARM2);
-	if (!s)
-		s = "";
 	for (i = 0;i < start && *s;i++, s++);
-	for (i = 0;i < VM_STRINGTEMP_LENGTH - 1 && *s && i < length;i++, s++)
+	for (i = 0;i < (int)sizeof(string) - 1 && *s && i < length;i++, s++)
 		string[i] = *s;
 	string[i] = 0;
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(string);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(string);
 }
 
 /*
@@ -1819,12 +1927,14 @@ void VM_strzone(void)
 {
 	char *out;
 	char string[VM_STRINGTEMP_LENGTH];
+	size_t alloclen;
 
 	VM_SAFEPARMCOUNT(1,VM_strzone);
 
 	VM_VarString(0, string, sizeof(string));
-	PRVM_G_INT(OFS_RETURN) = PRVM_AllocString(strlen(string) + 1, &out);
-	strcpy(out, string);
+	alloclen = strlen(string) + 1;
+	PRVM_G_INT(OFS_RETURN) = PRVM_AllocString(alloclen, &out);
+	memcpy(out, string, alloclen);
 }
 
 /*
@@ -1882,27 +1992,35 @@ float tokenize(string s)
 //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];
+int tokens[256];
 void VM_tokenize (void)
 {
-	size_t pos;
 	const char *p;
+#if 0
+	size_t pos = 0;
+	char tokenbuf[MAX_INPUTLINE];
+	size_t tokenlen;
+#endif
 
 	VM_SAFEPARMCOUNT(1,VM_tokenize);
 
 	p = PRVM_G_STRING(OFS_PARM0);
 
 	num_tokens = 0;
-	pos = 0;
 	while(COM_ParseToken(&p, false))
 	{
 		if (num_tokens >= (int)(sizeof(tokens)/sizeof(tokens[0])))
 			break;
-		if (pos + strlen(com_token) + 1 > sizeof(tokenbuf))
+#if 0
+		tokenlen = strlen(com_token) + 1;
+		if (pos + tokenlen > sizeof(tokenbuf))
 			break;
-		tokens[num_tokens++] = tokenbuf + pos;
-		strcpy(tokenbuf + pos, com_token);
-		pos += strlen(com_token) + 1;
+		tokens[num_tokens++] = PRVM_SetEngineString(tokenbuf + pos);
+		memcpy(tokenbuf + pos, com_token, tokenlen);
+		pos += tokenlen;
+#else
+		tokens[num_tokens++] = PRVM_SetTempString(com_token);
+#endif
 	}
 
 	PRVM_G_FLOAT(OFS_RETURN) = num_tokens;
@@ -1919,55 +2037,11 @@ void VM_argv (void)
 	token_num = (int)PRVM_G_FLOAT(OFS_PARM0);
 
 	if (token_num >= 0 && token_num < num_tokens)
-		PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(tokens[token_num]);
+		PRVM_G_INT(OFS_RETURN) = tokens[token_num];
 	else
-		PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(NULL);
+		PRVM_G_INT(OFS_RETURN) = OFS_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)
-{
-	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 = prog->edicts;
-
-	v = PRVM_GETEDICTFIELDVALUE(e, eval_tag_entity);
-	if (v)
-		fields.server->edict = PRVM_EDICT_TO_PROG(tagentity);
-
-	v = PRVM_GETEDICTFIELDVALUE(e, eval_tag_index);
-	if (v)
-		fields.server->_float = 0;
-	if (tagentity != NULL && tagentity != prog->edicts && tagname && tagname[0])
-	{
-		modelindex = (int)tagentity->fields.server->modelindex;
-		if (modelindex >= 0 && modelindex < MAX_MODELS)
-		{
-			model = sv.models[modelindex];
-			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 (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", PRVM_NUM_FOR_EDICT(e), PRVM_NUM_FOR_EDICT(tagentity), tagname, tagname, PRVM_NUM_FOR_EDICT(tagentity));
-	}
-}*/
-
 /*
 =========
 VM_isserver
@@ -2064,7 +2138,7 @@ void VM_gettime(void)
 {
 	VM_SAFEPARMCOUNT(0,VM_gettime);
 
-	PRVM_G_FLOAT(OFS_RETURN) = (float) *prog->time;
+	PRVM_G_FLOAT(OFS_RETURN) = (float) realtime;
 }
 
 /*
@@ -2124,11 +2198,7 @@ void VM_loadfromfile(void)
 	VM_SAFEPARMCOUNT(1,VM_loadfromfile);
 
 	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, '\\'))
+	if (FS_CheckNastyPath(filename, false))
 	{
 		PRVM_G_FLOAT(OFS_RETURN) = -4;
 		VM_Warning("VM_loadfromfile: %s dangerous or non-portable filename \"%s\" not allowed. (contains : or \\ or begins with .. or /)\n", PRVM_NAME, filename);
@@ -2167,17 +2237,21 @@ void VM_modulo(void)
 
 void VM_Search_Init(void)
 {
-	memset(VM_SEARCHLIST,0,sizeof(fssearch_t*[MAX_VMSEARCHES]));
+	int i;
+	for (i = 0;i < PRVM_MAX_OPENSEARCHES;i++)
+		prog->opensearches[i] = NULL;
 }
 
 void VM_Search_Reset(void)
 {
 	int i;
 	// reset the fssearch list
-	for(i = 0; i < MAX_VMSEARCHES; i++)
-		if(VM_SEARCHLIST[i])
-			FS_FreeSearch(VM_SEARCHLIST[i]);
-	memset(VM_SEARCHLIST,0,sizeof(fssearch_t*[MAX_VMSEARCHES]));
+	for(i = 0; i < PRVM_MAX_OPENSEARCHES; i++)
+	{
+		if(prog->opensearches[i])
+			FS_FreeSearch(prog->opensearches[i]);
+		prog->opensearches[i] = NULL;
+	}
 }
 
 /*
@@ -2202,18 +2276,18 @@ void VM_search_begin(void)
 	caseinsens = (int)PRVM_G_FLOAT(OFS_PARM1);
 	quiet = (int)PRVM_G_FLOAT(OFS_PARM2);
 
-	for(handle = 0; handle < MAX_VMSEARCHES; handle++)
-		if(!VM_SEARCHLIST[handle])
+	for(handle = 0; handle < PRVM_MAX_OPENSEARCHES; handle++)
+		if(!prog->opensearches[handle])
 			break;
 
-	if(handle >= MAX_VMSEARCHES)
+	if(handle >= PRVM_MAX_OPENSEARCHES)
 	{
 		PRVM_G_FLOAT(OFS_RETURN) = -2;
-		VM_Warning("VM_search_begin: %s ran out of search handles (%i)\n", PRVM_NAME, MAX_VMSEARCHES);
+		VM_Warning("VM_search_begin: %s ran out of search handles (%i)\n", PRVM_NAME, PRVM_MAX_OPENSEARCHES);
 		return;
 	}
 
-	if(!(VM_SEARCHLIST[handle] = FS_Search(pattern,caseinsens, quiet)))
+	if(!(prog->opensearches[handle] = FS_Search(pattern,caseinsens, quiet)))
 		PRVM_G_FLOAT(OFS_RETURN) = -1;
 	else
 		PRVM_G_FLOAT(OFS_RETURN) = handle;
@@ -2233,19 +2307,19 @@ void VM_search_end(void)
 
 	handle = (int)PRVM_G_FLOAT(OFS_PARM0);
 
-	if(handle < 0 || handle >= MAX_VMSEARCHES)
+	if(handle < 0 || handle >= PRVM_MAX_OPENSEARCHES)
 	{
 		VM_Warning("VM_search_end: invalid handle %i used in %s\n", handle, PRVM_NAME);
 		return;
 	}
-	if(VM_SEARCHLIST[handle] == NULL)
+	if(prog->opensearches[handle] == NULL)
 	{
 		VM_Warning("VM_search_end: no such handle %i in %s\n", handle, PRVM_NAME);
 		return;
 	}
 
-	FS_FreeSearch(VM_SEARCHLIST[handle]);
-	VM_SEARCHLIST[handle] = NULL;
+	FS_FreeSearch(prog->opensearches[handle]);
+	prog->opensearches[handle] = NULL;
 }
 
 /*
@@ -2262,18 +2336,18 @@ void VM_search_getsize(void)
 
 	handle = (int)PRVM_G_FLOAT(OFS_PARM0);
 
-	if(handle < 0 || handle >= MAX_VMSEARCHES)
+	if(handle < 0 || handle >= PRVM_MAX_OPENSEARCHES)
 	{
 		VM_Warning("VM_search_getsize: invalid handle %i used in %s\n", handle, PRVM_NAME);
 		return;
 	}
-	if(VM_SEARCHLIST[handle] == NULL)
+	if(prog->opensearches[handle] == NULL)
 	{
 		VM_Warning("VM_search_getsize: no such handle %i in %s\n", handle, PRVM_NAME);
 		return;
 	}
 
-	PRVM_G_FLOAT(OFS_RETURN) = VM_SEARCHLIST[handle]->numfilenames;
+	PRVM_G_FLOAT(OFS_RETURN) = prog->opensearches[handle]->numfilenames;
 }
 
 /*
@@ -2286,32 +2360,28 @@ string	search_getfilename(float handle, float num)
 void VM_search_getfilename(void)
 {
 	int handle, filenum;
-	char *tmp;
 	VM_SAFEPARMCOUNT(2, VM_search_getfilename);
 
 	handle = (int)PRVM_G_FLOAT(OFS_PARM0);
 	filenum = (int)PRVM_G_FLOAT(OFS_PARM1);
 
-	if(handle < 0 || handle >= MAX_VMSEARCHES)
+	if(handle < 0 || handle >= PRVM_MAX_OPENSEARCHES)
 	{
 		VM_Warning("VM_search_getfilename: invalid handle %i used in %s\n", handle, PRVM_NAME);
 		return;
 	}
-	if(VM_SEARCHLIST[handle] == NULL)
+	if(prog->opensearches[handle] == NULL)
 	{
 		VM_Warning("VM_search_getfilename: no such handle %i in %s\n", handle, PRVM_NAME);
 		return;
 	}
-	if(filenum < 0 || filenum >= VM_SEARCHLIST[handle]->numfilenames)
+	if(filenum < 0 || filenum >= prog->opensearches[handle]->numfilenames)
 	{
 		VM_Warning("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_SetEngineString(tmp);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog->opensearches[handle]->filenames[filenum]);
 }
 
 /*
@@ -2323,14 +2393,13 @@ string	chr(float ascii)
 */
 void VM_chr(void)
 {
-	char *tmp;
+	char tmp[2];
 	VM_SAFEPARMCOUNT(1, VM_chr);
 
-	tmp = VM_GetTempString();
 	tmp[0] = (unsigned char) PRVM_G_FLOAT(OFS_PARM0);
 	tmp[1] = 0;
 
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(tmp);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(tmp);
 }
 
 //=============================================================================
@@ -2366,15 +2435,11 @@ void VM_precache_pic(void)
 
 	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", PRVM_NAME);
-
 	VM_CheckEmptyString (s);
 
 	// 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);
+		PRVM_G_INT(OFS_RETURN) = OFS_NULL;
 }
 
 /*
@@ -2391,10 +2456,6 @@ void VM_freepic(void)
 	VM_SAFEPARMCOUNT(1,VM_freepic);
 
 	s = PRVM_G_STRING(OFS_PARM0);
-
-	if(!s)
-		PRVM_ERROR ("VM_freepic: %s: NULL");
-
 	VM_CheckEmptyString (s);
 
 	Draw_FreePic(s);
@@ -2463,15 +2524,6 @@ void VM_drawstring(void)
 	VM_SAFEPARMCOUNT(6,VM_drawstring);
 
 	string = PRVM_G_STRING(OFS_PARM1);
-	if(!string)
-	{
-		PRVM_G_FLOAT(OFS_RETURN) = -1;
-		VM_Warning("VM_drawstring: %s passed null string !\n",PRVM_NAME);
-		return;
-	}
-
-	//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);
@@ -2492,7 +2544,7 @@ 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%s from %s discarded\n",(pos[2] && scale[2]) ? "s" : " ",((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;
@@ -2513,14 +2565,6 @@ void VM_drawpic(void)
 	VM_SAFEPARMCOUNT(6,VM_drawpic);
 
 	picname = PRVM_G_STRING(OFS_PARM1);
-
-	if(!picname)
-	{
-		PRVM_G_FLOAT(OFS_RETURN) = -1;
-		VM_Warning("VM_drawpic: %s passed null picture name !\n", PRVM_NAME);
-		return;
-	}
-
 	VM_CheckEmptyString (picname);
 
 	// is pic cached ? no function yet for that
@@ -2539,12 +2583,12 @@ void VM_drawpic(void)
 	if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
 	{
 		PRVM_G_FLOAT(OFS_RETURN) = -2;
-		VM_Warning("VM_drawstring: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
+		VM_Warning("VM_drawpic: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
 		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_drawpic: z value%s from %s discarded\n",(pos[2] && size[2]) ? "s" : " ",((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size")));
 
 	DrawQ_Pic(pos[0], pos[1], Draw_CachePic(picname, true), size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag);
 	PRVM_G_FLOAT(OFS_RETURN) = 1;
@@ -2573,12 +2617,12 @@ void VM_drawfill(void)
 	if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
 	{
 		PRVM_G_FLOAT(OFS_RETURN) = -2;
-		VM_Warning("VM_drawstring: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
+		VM_Warning("VM_drawfill: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
 		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_drawfill: z value%s from %s discarded\n",(pos[2] && size[2]) ? "s" : " ",((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size")));
 
 	DrawQ_Pic(pos[0], pos[1], NULL, size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM3), flag);
 	PRVM_G_FLOAT(OFS_RETURN) = 1;
@@ -2633,10 +2677,6 @@ void VM_getimagesize(void)
 	VM_SAFEPARMCOUNT(1,VM_getimagesize);
 
 	p = PRVM_G_STRING(OFS_PARM0);
-
-	if(!p)
-		PRVM_ERROR("VM_getimagepos: %s passed null picture name !", PRVM_NAME);
-
 	VM_CheckEmptyString (p);
 
 	pic = Draw_CachePic (p, false);
@@ -2655,17 +2695,9 @@ string keynumtostring(float keynum)
 */
 void VM_keynumtostring (void)
 {
-	int keynum;
-	char *tmp;
 	VM_SAFEPARMCOUNT(1, VM_keynumtostring);
 
-	keynum = (int)PRVM_G_FLOAT(OFS_PARM0);
-
-	tmp = VM_GetTempString();
-
-	strcpy(tmp, Key_KeynumToString(keynum));
-
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(tmp);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(Key_KeynumToString((int)PRVM_G_FLOAT(OFS_PARM0)));
 }
 
 /*
@@ -2677,12 +2709,9 @@ float stringtokeynum(string key)
 */
 void VM_stringtokeynum (void)
 {
-	const char *str;
 	VM_SAFEPARMCOUNT( 1, VM_keynumtostring );
 
-	str = PRVM_G_STRING( OFS_PARM0 );
-
-	PRVM_G_INT(OFS_RETURN) = Key_StringToKeynum( str );
+	PRVM_G_INT(OFS_RETURN) = Key_StringToKeynum(PRVM_G_STRING(OFS_PARM0));
 }
 
 // CL_Video interface functions
@@ -3007,7 +3036,7 @@ void VM_R_PolygonBegin (void)
 	if(picname[0])
 		p->tex = Draw_CachePic(picname, true)->tex;
 	else
-		p->tex = r_texture_notexture;
+		p->tex = r_texture_white;
 	p->flags = (unsigned char)PRVM_G_FLOAT(OFS_PARM1);
 	vm_current_vertices = 0;
 	vm_polygonbegin = true;
@@ -3049,8 +3078,7 @@ void VM_R_PolygonVertex (void)
 
 	p->data[vm_current_vertices*3]		= coords[0];
 	p->data[1+vm_current_vertices*3]	= coords[1];
-	if(!(p->flags & VM_POLYGON_FL2D))
-		p->data[2+vm_current_vertices*3]	= coords[2];
+	p->data[2+vm_current_vertices*3]	= coords[2];
 
 	p->data[12+vm_current_vertices*2]	= tx[0];
 	if(!(p->flags & VM_POLYGON_FLLINES))
@@ -3091,14 +3119,114 @@ void VM_R_PolygonEnd (void)
 
 void VM_AddPolygonsToMeshQueue (void)
 {
-	unsigned int i;
+	int i;
 	if(!vm_drawpolygons_num)
 		return;
-	for(i = 0;i < vm_drawpolygons_num;i++)
-		VM_DrawPolygonCallback(NULL, NULL, i, NULL);
+	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;
 }
 
+void Debug_PolygonBegin(const char *picname, int flags, qboolean draw2d, float linewidth)
+{
+	vm_polygon_t	*p;
+
+	if(!vm_polygons_initialized)
+		VM_InitPolygons();
+	if(vm_polygonbegin)
+	{
+		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;
+	}
+}
+
+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)
+	{
+		Con_Printf("Debug_PolygonVertex: Debug_PolygonBegin wasn't called\n");
+		return;
+	}
+
+	p = &vm_polygons[vm_drawpolygons_num];
+	if(vm_current_vertices > 4)
+	{
+		Con_Printf("Debug_PolygonVertex: may have 4 vertices max\n");
+		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;
+}
+
+void Debug_PolygonEnd(void)
+{
+	if(!vm_polygonbegin)
+	{
+		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_AddPolygonTo2DScene(&vm_polygons[vm_drawpolygons_num]);
+		else
+			vm_drawpolygons_num++;
+	}
+	else
+		Con_Printf("Debug_PolygonEnd: %i vertices isn't a good choice\n", vm_current_vertices);
+}
+
+
 
 
 
@@ -3162,17 +3290,16 @@ string altstr_prepare(string)
 */
 void VM_altstr_prepare( void )
 {
-	char *outstr, *out;
+	char *out;
 	const char *instr, *in;
 	int size;
+	char outstr[VM_STRINGTEMP_LENGTH];
 
 	VM_SAFEPARMCOUNT( 1, VM_altstr_prepare );
 
 	instr = PRVM_G_STRING( OFS_PARM0 );
-	//VM_CheckEmptyString( instr );
-	outstr = VM_GetTempString();
 
-	for( out = outstr, in = instr, size = VM_STRINGTEMP_LENGTH - 1 ; size && *in ; size--, in++, out++ )
+	for( out = outstr, in = instr, size = sizeof(outstr) - 1 ; size && *in ; size--, in++, out++ )
 		if( *in == '\'' ) {
 			*out++ = '\\';
 			*out = '\'';
@@ -3181,7 +3308,7 @@ void VM_altstr_prepare( void )
 			*out = *in;
 	*out = 0;
 
-	PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( outstr );
+	PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( outstr );
 }
 
 /*
@@ -3194,13 +3321,13 @@ string altstr_get(string, float)
 void VM_altstr_get( void )
 {
 	const char *altstr, *pos;
-	char *outstr, *out;
+	char *out;
 	int count, size;
+	char outstr[VM_STRINGTEMP_LENGTH];
 
 	VM_SAFEPARMCOUNT( 2, VM_altstr_get );
 
 	altstr = PRVM_G_STRING( OFS_PARM0 );
-	//VM_CheckEmptyString( altstr );
 
 	count = (int)PRVM_G_FLOAT( OFS_PARM1 );
 	count = count * 2 + 1;
@@ -3213,12 +3340,11 @@ void VM_altstr_get( void )
 			count--;
 
 	if( !*pos ) {
-		PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( NULL );
+		PRVM_G_INT( OFS_RETURN ) = 0;
 		return;
 	}
 
-    outstr = VM_GetTempString();
-	for( out = outstr, size = VM_STRINGTEMP_LENGTH - 1 ; size && *pos ; size--, pos++, out++ )
+	for( out = outstr, size = sizeof(outstr) - 1 ; size && *pos ; size--, pos++, out++ )
 		if( *pos == '\\' ) {
 			if( !*++pos )
 				break;
@@ -3230,7 +3356,7 @@ void VM_altstr_get( void )
 			*out = *pos;
 
 	*out = 0;
-	PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( outstr );
+	PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( outstr );
 }
 
 /*
@@ -3245,19 +3371,18 @@ void VM_altstr_set( void )
     int num;
 	const char *altstr, *str;
 	const char *in;
-	char *outstr, *out;
+	char *out;
+	char outstr[VM_STRINGTEMP_LENGTH];
 
 	VM_SAFEPARMCOUNT( 3, VM_altstr_set );
 
 	altstr = PRVM_G_STRING( OFS_PARM0 );
-	//VM_CheckEmptyString( altstr );
 
 	num = (int)PRVM_G_FLOAT( OFS_PARM1 );
 
 	str = PRVM_G_STRING( OFS_PARM2 );
-	//VM_CheckEmptyString( str );
 
-	outstr = out = VM_GetTempString();
+	out = outstr;
 	for( num = num * 2 + 1, in = altstr; *in && num; *out++ = *in++ )
 		if( *in == '\\' ) {
 			if( !*++in ) {
@@ -3267,10 +3392,6 @@ void VM_altstr_set( void )
 			num--;
 		}
 
-	if( !in ) {
-		PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( altstr );
-		return;
-	}
 	// copy set in
 	for( ; *str; *out++ = *str++ );
 	// now jump over the old content
@@ -3278,13 +3399,8 @@ void VM_altstr_set( void )
 		if( *in == '\'' || (*in == '\\' && !*++in) )
 			break;
 
-	if( !in ) {
-		PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( NULL );
-		return;
-	}
-
-	strcpy( out, in );
-	PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( outstr );
+	strlcpy(out, in, outstr + sizeof(outstr) - out);
+	PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( outstr );
 }
 
 /*
@@ -3301,14 +3417,14 @@ void VM_altstr_ins(void)
 	const char *set;
 	const char *instr;
 	const char *in;
-	char *outstr;
 	char *out;
+	char outstr[VM_STRINGTEMP_LENGTH];
 
 	in = instr = PRVM_G_STRING( OFS_PARM0 );
 	num = (int)PRVM_G_FLOAT( OFS_PARM1 );
 	set = setstr = PRVM_G_STRING( OFS_PARM2 );
 
-	out = outstr = VM_GetTempString();
+	out = outstr;
 	for( num = num * 2 + 2 ; *in && num > 0 ; *out++ = *in++ )
 		if( *in == '\\' ) {
 			if( !*++in ) {
@@ -3322,8 +3438,8 @@ void VM_altstr_ins(void)
 	for( ; *set ; *out++ = *set++ );
 	*out++ = '\'';
 
-	strcpy( out, in );
-	PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( outstr );
+	strlcpy(out, in, outstr + sizeof(outstr) - out);
+	PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( outstr );
 }
 
 
@@ -3527,13 +3643,15 @@ void VM_buf_copy (void)
 	for(i=0;i<b1->num_strings;i++)
 		if(b1->strings[i] && b1->strings[i][0])
 		{
-			b2->strings[i] = (char *)Z_Malloc(strlen(b1->strings[i])+1);
+			size_t stringlen;
+			stringlen = strlen(b1->strings[i]) + 1;
+			b2->strings[i] = (char *)Z_Malloc(stringlen);
 			if(!b2->strings[i])
 			{
 				VM_Warning("VM_buf_copy: not enough memory for buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM1), PRVM_NAME);
 				break;
 			}
-			strcpy(b2->strings[i], b1->strings[i]);
+			memcpy(b2->strings[i], b1->strings[i], stringlen);
 		}
 }
 
@@ -3597,14 +3715,14 @@ string buf_implode(float bufhandle, string glue) = #465;
 void VM_buf_implode (void)
 {
 	qcstrbuffer_t	*b;
-	char			*k;
+	char			k[VM_STRINGTEMP_LENGTH];
 	const char		*sep;
 	int				i;
 	size_t			l;
 	VM_SAFEPARMCOUNT(2, VM_buf_implode);
 
 	b = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0));
-	PRVM_G_INT(OFS_RETURN) = 0;
+	PRVM_G_INT(OFS_RETURN) = OFS_NULL;
 	if(!b)
 	{
 		VM_Warning("VM_buf_implode: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
@@ -3613,34 +3731,23 @@ void VM_buf_implode (void)
 	if(!b->num_strings)
 		return;
 	sep = PRVM_G_STRING(OFS_PARM1);
-	k = VM_GetTempString();
 	k[0] = 0;
 	for(l=i=0;i<b->num_strings;i++)
 		if(b->strings[i])
 		{
-			l += strlen(b->strings[i]);
-			if(l>=4095)
-				break;
-			k = strcat(k, b->strings[i]);
-			if(!k)
+			l += (i > 0 ? strlen(sep) : 0) + strlen(b->strings[i]);
+			if (l >= sizeof(k) - 1)
 				break;
-			if(sep && (i != b->num_strings-1))
-			{
-				l += strlen(sep);
-				if(l>=4095)
-					break;
-				k = strcat(k, sep);
-				if(!k)
-					break;
-			}
+			strlcat(k, sep, sizeof(k));
+			strlcat(k, b->strings[i], sizeof(k));
 		}
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(k);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(k);
 }
 
 /*
 ========================
 VM_bufstr_get
-get a string from buffer, returns direct pointer, dont str_unzone it!
+get a string from buffer, returns tempstring, dont str_unzone it!
 string bufstr_get(float bufhandle, float string_index) = #465;
 ========================
 */
@@ -3650,6 +3757,7 @@ void VM_bufstr_get (void)
 	int				strindex;
 	VM_SAFEPARMCOUNT(2, VM_bufstr_get);
 
+	PRVM_G_INT(OFS_RETURN) = OFS_NULL;
 	b = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0));
 	if(!b)
 	{
@@ -3662,11 +3770,10 @@ void VM_bufstr_get (void)
 		VM_Warning("VM_bufstr_get: invalid string index %i used in %s\n", strindex, PRVM_NAME);
 		return;
 	}
-	PRVM_G_INT(OFS_RETURN) = 0;
 	if(b->num_strings <= strindex)
 		return;
 	if(b->strings[strindex])
-		PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(b->strings[strindex]);
+		PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(b->strings[strindex]);
 }
 
 /*
@@ -3681,6 +3788,7 @@ void VM_bufstr_set (void)
 	int				bufindex, strindex;
 	qcstrbuffer_t	*b;
 	const char		*news;
+	size_t			alloclen;
 
 	VM_SAFEPARMCOUNT(3, VM_bufstr_set);
 
@@ -3698,15 +3806,11 @@ void VM_bufstr_set (void)
 		return;
 	}
 	news = PRVM_G_STRING(OFS_PARM2);
-	if(!news)
-	{
-		VM_Warning("VM_bufstr_set: null string used in %s\n", PRVM_NAME);
-		return;
-	}
 	if(b->strings[strindex])
 		Z_Free(b->strings[strindex]);
-	b->strings[strindex] = (char *)Z_Malloc(strlen(news)+1);
-	strcpy(b->strings[strindex], news);
+	alloclen = strlen(news) + 1;
+	b->strings[strindex] = (char *)Z_Malloc(alloclen);
+	memcpy(b->strings[strindex], news, alloclen);
 }
 
 /*
@@ -3722,6 +3826,7 @@ void VM_bufstr_add (void)
 	int				bufindex, order, strindex;
 	qcstrbuffer_t	*b;
 	const char		*string;
+	size_t			alloclen;
 
 	VM_SAFEPARMCOUNT(3, VM_bufstr_add);
 
@@ -3734,12 +3839,6 @@ void VM_bufstr_add (void)
 		return;
 	}
 	string = PRVM_G_STRING(OFS_PARM1);
-	if(!string)
-	{
-		VM_Warning("VM_bufstr_add: null string used in %s\n", PRVM_NAME);
-		return;
-	}
-
 	order = (int)PRVM_G_FLOAT(OFS_PARM2);
 	if(order)
 		strindex = b->num_strings;
@@ -3765,8 +3864,9 @@ void VM_bufstr_add (void)
 	}
 	if(b->strings[strindex])
 		Z_Free(b->strings[strindex]);
-	b->strings[strindex] = (char *)Z_Malloc(strlen(string)+1);
-	strcpy(b->strings[strindex], string);
+	alloclen = strlen(string) + 1;
+	b->strings[strindex] = (char *)Z_Malloc(alloclen);
+	memcpy(b->strings[strindex], string, alloclen);
 	PRVM_G_FLOAT(OFS_RETURN) = strindex;
 }
 
@@ -3804,6 +3904,124 @@ void VM_bufstr_free (void)
 
 //=============
 
+/*
+==============
+VM_changeyaw
+
+This was a major timewaster in progs, so it was converted to C
+==============
+*/
+void VM_changeyaw (void)
+{
+	prvm_edict_t		*ent;
+	float		ideal, current, move, speed;
+
+	ent = PRVM_PROG_TO_EDICT(PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict);
+	if (ent == prog->edicts)
+	{
+		VM_Warning("changeyaw: can not modify world entity\n");
+		return;
+	}
+	if (ent->priv.server->free)
+	{
+		VM_Warning("changeyaw: can not modify free entity\n");
+		return;
+	}
+	if (prog->fieldoffsets.angles < 0 || prog->fieldoffsets.ideal_yaw < 0 || prog->fieldoffsets.yaw_speed < 0)
+	{
+		VM_Warning("changeyaw: angles, ideal_yaw, or yaw_speed field(s) not found\n");
+		return;
+	}
+	current = ANGLEMOD(PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.angles)->vector[1]);
+	ideal = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.ideal_yaw)->_float;
+	speed = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.yaw_speed)->_float;
+
+	if (current == ideal)
+		return;
+	move = ideal - current;
+	if (ideal > current)
+	{
+		if (move >= 180)
+			move = move - 360;
+	}
+	else
+	{
+		if (move <= -180)
+			move = move + 360;
+	}
+	if (move > 0)
+	{
+		if (move > speed)
+			move = speed;
+	}
+	else
+	{
+		if (move < -speed)
+			move = -speed;
+	}
+
+	PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.angles)->vector[1] = ANGLEMOD (current + move);
+}
+
+/*
+==============
+VM_changepitch
+==============
+*/
+void VM_changepitch (void)
+{
+	prvm_edict_t		*ent;
+	float		ideal, current, move, speed;
+
+	ent = PRVM_G_EDICT(OFS_PARM0);
+	if (ent == prog->edicts)
+	{
+		VM_Warning("changepitch: can not modify world entity\n");
+		return;
+	}
+	if (ent->priv.server->free)
+	{
+		VM_Warning("changepitch: can not modify free entity\n");
+		return;
+	}
+	if (prog->fieldoffsets.angles < 0 || prog->fieldoffsets.idealpitch < 0 || prog->fieldoffsets.pitch_speed < 0)
+	{
+		VM_Warning("changepitch: angles, idealpitch, or pitch_speed field(s) not found\n");
+		return;
+	}
+	current = ANGLEMOD(PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.angles)->vector[0]);
+	ideal = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.idealpitch)->_float;
+	speed = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.pitch_speed)->_float;
+
+	if (current == ideal)
+		return;
+	move = ideal - current;
+	if (ideal > current)
+	{
+		if (move >= 180)
+			move = move - 360;
+	}
+	else
+	{
+		if (move <= -180)
+			move = move + 360;
+	}
+	if (move > 0)
+	{
+		if (move > speed)
+			move = speed;
+	}
+	else
+	{
+		if (move < -speed)
+			move = -speed;
+	}
+
+	PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.angles)->vector[0] = ANGLEMOD (current + move);
+}
+
+//=============
+
 void VM_Cmd_Init(void)
 {
 	// only init the stuff for the current prog