X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=prvm_cmds.c;h=c1be177c09848e343e02748396319cbabc23541b;hp=5a86819ec7f701760ddc83689451d6c11aa8af57;hb=cf22ff4047c6cac2ee44bb3ecf554ca0f9eed819;hpb=a2535521709ba873592188925ed1c9c170eb662c

diff --git a/prvm_cmds.c b/prvm_cmds.c
index 5a86819e..c1be177c 100644
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -7,6 +7,7 @@
 #include "quakedef.h"
 
 #include "prvm_cmds.h"
+#include "libcurl.h"
 #include <time.h>
 
 extern cvar_t prvm_backtraceforwarnings;
@@ -22,7 +23,7 @@ void VM_Warning(const char *fmt, ...)
 	dpvsnprintf(msg,sizeof(msg),fmt,argptr);
 	va_end(argptr);
 
-	Con_Printf(msg);
+	Con_Print(msg);
 
 	// TODO: either add a cvar/cmd to control the state dumping or replace some of the calls with Con_Printf [9/13/2006 Black]
 	if(prvm_backtraceforwarnings.integer && recursive != realtime) // NOTE: this compares to the time, just in case if PRVM_PrintState causes a Host_Error and keeps recursive set
@@ -44,7 +45,7 @@ void VM_Warning(const char *fmt, ...)
 
 void VM_CheckEmptyString (const char *s)
 {
-	if (s[0] <= ' ')
+	if (ISWHITESPACE(s[0]))
 		PRVM_ERROR ("%s: Bad string", PRVM_NAME);
 }
 
@@ -412,6 +413,13 @@ void VM_localcmd (void)
 	Cbuf_AddText(string);
 }
 
+static qboolean PRVM_Cvar_ReadOk(const char *string)
+{
+	cvar_t *cvar;
+	cvar = Cvar_FindVar(string);
+	return ((cvar) && ((cvar->flags & CVAR_PRIVATE) == 0));
+}
+
 /*
 =================
 VM_cvar
@@ -425,7 +433,7 @@ void VM_cvar (void)
 	VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar);
 	VM_VarString(0, string, sizeof(string));
 	VM_CheckEmptyString(string);
-	PRVM_G_FLOAT(OFS_RETURN) = Cvar_VariableValue(string);
+	PRVM_G_FLOAT(OFS_RETURN) = PRVM_Cvar_ReadOk(string) ? Cvar_VariableValue(string) : 0;
 }
 
 /*
@@ -438,6 +446,7 @@ float CVAR_TYPEFLAG_SAVED = 2;
 float CVAR_TYPEFLAG_PRIVATE = 4;
 float CVAR_TYPEFLAG_ENGINE = 8;
 float CVAR_TYPEFLAG_HASDESCRIPTION = 16;
+float CVAR_TYPEFLAG_READONLY = 32;
 =================
 */
 void VM_cvar_type (void)
@@ -465,8 +474,10 @@ void VM_cvar_type (void)
 		ret |= 4; // CVAR_TYPE_PRIVATE
 	if(!(cvar->flags & CVAR_ALLOCATED))
 		ret |= 8; // CVAR_TYPE_ENGINE
-	if(strcmp(cvar->description, "custom cvar")) // has to match Cvar_Get's placeholder string
+	if(cvar->description != cvar_dummy_description)
 		ret |= 16; // CVAR_TYPE_HASDESCRIPTION
+	if(cvar->flags & CVAR_READONLY)
+		ret |= 32; // CVAR_TYPE_READONLY
 	
 	PRVM_G_FLOAT(OFS_RETURN) = ret;
 }
@@ -484,7 +495,7 @@ void VM_cvar_string(void)
 	VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar_string);
 	VM_VarString(0, string, sizeof(string));
 	VM_CheckEmptyString(string);
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(Cvar_VariableString(string));
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(PRVM_Cvar_ReadOk(string) ? Cvar_VariableString(string) : "");
 }
 
 
@@ -503,6 +514,22 @@ void VM_cvar_defstring (void)
 	VM_CheckEmptyString(string);
 	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(Cvar_VariableDefString(string));
 }
+
+/*
+========================
+VM_cvar_defstring
+
+const string	VM_cvar_description (string, ...)
+========================
+*/
+void VM_cvar_description (void)
+{
+	char string[VM_STRINGTEMP_LENGTH];
+	VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar_description);
+	VM_VarString(0, string, sizeof(string));
+	VM_CheckEmptyString(string);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(Cvar_VariableDescription(string));
+}
 /*
 =================
 VM_cvar_set
@@ -561,9 +588,9 @@ void VM_ftos (void)
 	v = PRVM_G_FLOAT(OFS_PARM0);
 
 	if ((float)((int)v) == v)
-		sprintf(s, "%i", (int)v);
+		dpsnprintf(s, sizeof(s), "%i", (int)v);
 	else
-		sprintf(s, "%f", v);
+		dpsnprintf(s, sizeof(s), "%f", v);
 	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(s);
 }
 
@@ -599,7 +626,7 @@ void VM_vtos (void)
 
 	VM_SAFEPARMCOUNT(1,VM_vtos);
 
-	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]);
+	dpsnprintf (s, sizeof(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_SetTempString(s);
 }
 
@@ -617,7 +644,7 @@ void VM_etos (void)
 
 	VM_SAFEPARMCOUNT(1, VM_etos);
 
-	sprintf (s, "entity %i", PRVM_G_EDICTNUM(OFS_PARM0));
+	dpsnprintf (s, sizeof(s), "entity %i", PRVM_G_EDICTNUM(OFS_PARM0));
 	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(s);
 }
 
@@ -668,6 +695,19 @@ void VM_ftoe(void)
 	PRVM_G_INT(OFS_RETURN) = ent;
 }
 
+/*
+========================
+VM_etof
+
+float etof(entity ent)
+========================
+*/
+void VM_etof(void)
+{
+	VM_SAFEPARMCOUNT(1, VM_etof);
+	PRVM_G_FLOAT(OFS_RETURN) = PRVM_G_EDICTNUM(OFS_PARM0);
+}
+
 /*
 =========
 VM_strftime
@@ -678,23 +718,40 @@ string strftime(float uselocaltime, string[, string ...])
 void VM_strftime(void)
 {
 	time_t t;
+#if _MSC_VER >= 1400
+	struct tm tm;
+	int tmresult;
+#else
 	struct tm *tm;
+#endif
 	char fmt[VM_STRINGTEMP_LENGTH];
 	char result[VM_STRINGTEMP_LENGTH];
 	VM_SAFEPARMCOUNTRANGE(2, 8, VM_strftime);
 	VM_VarString(1, fmt, sizeof(fmt));
 	t = time(NULL);
+#if _MSC_VER >= 1400
+	if (PRVM_G_FLOAT(OFS_PARM0))
+		tmresult = localtime_s(&tm, &t);
+	else
+		tmresult = gmtime_s(&tm, &t);
+	if (!tmresult)
+#else
 	if (PRVM_G_FLOAT(OFS_PARM0))
 		tm = localtime(&t);
 	else
 		tm = gmtime(&t);
 	if (!tm)
+#endif
 	{
-		PRVM_G_FLOAT(OFS_RETURN) = 0;
+		PRVM_G_INT(OFS_RETURN) = 0;
 		return;
 	}
+#if _MSC_VER >= 1400
+	strftime(result, sizeof(result), fmt, &tm);
+#else
 	strftime(result, sizeof(result), fmt, tm);
-	PRVM_G_FLOAT(OFS_RETURN) = PRVM_SetTempString(result);
+#endif
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(result);
 }
 
 /*
@@ -841,11 +898,16 @@ void VM_findchain (void)
 	int		f;
 	const char	*s, *t;
 	prvm_edict_t	*ent, *chain;
+	int chainfield;
 
-	VM_SAFEPARMCOUNT(2,VM_findchain);
+	VM_SAFEPARMCOUNTRANGE(2,3,VM_findchain);
 
-	if (prog->fieldoffsets.chain < 0)
-		PRVM_ERROR("VM_findchain: %s doesnt have a chain field !", PRVM_NAME);
+	if(prog->argc == 3)
+		chainfield = PRVM_G_INT(OFS_PARM2);
+	else
+		chainfield = prog->fieldoffsets.chain;
+	if (chainfield < 0)
+		PRVM_ERROR("VM_findchain: %s doesnt have the specified chain field !", PRVM_NAME);
 
 	chain = prog->edicts;
 
@@ -868,7 +930,7 @@ void VM_findchain (void)
 		if (strcmp(t,s))
 			continue;
 
-		PRVM_EDICTFIELDVALUE(ent,prog->fieldoffsets.chain)->edict = PRVM_NUM_FOR_EDICT(chain);
+		PRVM_EDICTFIELDVALUE(ent,chainfield)->edict = PRVM_NUM_FOR_EDICT(chain);
 		chain = ent;
 	}
 
@@ -891,11 +953,16 @@ void VM_findchainfloat (void)
 	int		f;
 	float	s;
 	prvm_edict_t	*ent, *chain;
+	int chainfield;
 
-	VM_SAFEPARMCOUNT(2, VM_findchainfloat);
+	VM_SAFEPARMCOUNTRANGE(2, 3, VM_findchainfloat);
 
-	if (prog->fieldoffsets.chain < 0)
-		PRVM_ERROR("VM_findchainfloat: %s doesnt have a chain field !", PRVM_NAME);
+	if(prog->argc == 3)
+		chainfield = PRVM_G_INT(OFS_PARM2);
+	else
+		chainfield = prog->fieldoffsets.chain;
+	if (chainfield < 0)
+		PRVM_ERROR("VM_findchain: %s doesnt have the specified chain field !", PRVM_NAME);
 
 	chain = (prvm_edict_t *)prog->edicts;
 
@@ -911,7 +978,7 @@ void VM_findchainfloat (void)
 		if (PRVM_E_FLOAT(ent,f) != s)
 			continue;
 
-		PRVM_EDICTFIELDVALUE(ent,prog->fieldoffsets.chain)->edict = PRVM_EDICT_TO_PROG(chain);
+		PRVM_EDICTFIELDVALUE(ent,chainfield)->edict = PRVM_EDICT_TO_PROG(chain);
 		chain = ent;
 	}
 
@@ -972,11 +1039,16 @@ void VM_findchainflags (void)
 	int		f;
 	int		s;
 	prvm_edict_t	*ent, *chain;
+	int chainfield;
 
-	VM_SAFEPARMCOUNT(2, VM_findchainflags);
+	VM_SAFEPARMCOUNTRANGE(2, 3, VM_findchainflags);
 
-	if (prog->fieldoffsets.chain < 0)
-		PRVM_ERROR("VM_findchainflags: %s doesnt have a chain field !", PRVM_NAME);
+	if(prog->argc == 3)
+		chainfield = PRVM_G_INT(OFS_PARM2);
+	else
+		chainfield = prog->fieldoffsets.chain;
+	if (chainfield < 0)
+		PRVM_ERROR("VM_findchain: %s doesnt have the specified chain field !", PRVM_NAME);
 
 	chain = (prvm_edict_t *)prog->edicts;
 
@@ -994,7 +1066,7 @@ void VM_findchainflags (void)
 		if (!((int)PRVM_E_FLOAT(ent,f) & s))
 			continue;
 
-		PRVM_EDICTFIELDVALUE(ent,prog->fieldoffsets.chain)->edict = PRVM_EDICT_TO_PROG(chain);
+		PRVM_EDICTFIELDVALUE(ent,chainfield)->edict = PRVM_EDICT_TO_PROG(chain);
 		chain = ent;
 	}
 
@@ -1018,7 +1090,7 @@ void VM_precache_sound (void)
 	PRVM_G_INT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0);
 	VM_CheckEmptyString(s);
 
-	if(snd_initialized.integer && !S_PrecacheSound(s, true, false))
+	if(snd_initialized.integer && !S_PrecacheSound(s, true, true))
 	{
 		VM_Warning("VM_precache_sound: Failed to load %s for %s\n", s, PRVM_NAME);
 		return;
@@ -1408,7 +1480,7 @@ void VM_registercvar (void)
 		return;
 	}
 
-	Cvar_Get(name, value, flags);
+	Cvar_Get(name, value, flags, NULL);
 
 	PRVM_G_FLOAT(OFS_RETURN) = 1; // success
 }
@@ -1555,28 +1627,29 @@ void VM_fopen(void)
 		VM_Warning("VM_fopen: %s ran out of file handles (%i)\n", PRVM_NAME, PRVM_MAX_OPENFILES);
 		return;
 	}
+	filename = PRVM_G_STRING(OFS_PARM0);
 	mode = (int)PRVM_G_FLOAT(OFS_PARM1);
 	switch(mode)
 	{
 	case 0: // FILE_READ
 		modestring = "rb";
+		prog->openfiles[filenum] = FS_OpenVirtualFile(va("data/%s", filename), false);
+		if (prog->openfiles[filenum] == NULL)
+			prog->openfiles[filenum] = FS_OpenVirtualFile(va("%s", filename), false);
 		break;
 	case 1: // FILE_APPEND
-		modestring = "ab";
+		modestring = "a";
+		prog->openfiles[filenum] = FS_OpenRealFile(va("data/%s", filename), modestring, false);
 		break;
 	case 2: // FILE_WRITE
-		modestring = "wb";
+		modestring = "w";
+		prog->openfiles[filenum] = FS_OpenRealFile(va("data/%s", filename), modestring, false);
 		break;
 	default:
 		PRVM_G_FLOAT(OFS_RETURN) = -3;
 		VM_Warning("VM_fopen: %s: no such mode %i (valid: 0 = read, 1 = append, 2 = write)\n", PRVM_NAME, mode);
 		return;
 	}
-	filename = PRVM_G_STRING(OFS_PARM0);
-
-	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 (prog->openfiles[filenum] == NULL)
 	{
@@ -1589,6 +1662,7 @@ void VM_fopen(void)
 		PRVM_G_FLOAT(OFS_RETURN) = filenum;
 		if (developer.integer >= 100)
 			Con_Printf("VM_fopen: %s: %s mode %s opened as #%i\n", PRVM_NAME, filename, modestring, filenum);
+		prog->openfiles_origin[filenum] = PRVM_AllocationOrigin();
 	}
 }
 
@@ -1619,6 +1693,8 @@ void VM_fclose(void)
 	}
 	FS_Close(prog->openfiles[filenum]);
 	prog->openfiles[filenum] = NULL;
+	if(prog->openfiles_origin[filenum])
+		PRVM_Free((char *)prog->openfiles_origin[filenum]);
 	if (developer.integer >= 100)
 		Con_Printf("VM_fclose: %s: #%i closed\n", PRVM_NAME, filenum);
 }
@@ -1741,6 +1817,155 @@ void VM_writetofile(void)
 	PRVM_ED_Write (file, ent);
 }
 
+// KrimZon - DP_QC_ENTITYDATA
+/*
+=========
+VM_numentityfields
+
+float() numentityfields
+Return the number of entity fields - NOT offsets
+=========
+*/
+void VM_numentityfields(void)
+{
+	PRVM_G_FLOAT(OFS_RETURN) = prog->progs->numfielddefs;
+}
+
+// KrimZon - DP_QC_ENTITYDATA
+/*
+=========
+VM_entityfieldname
+
+string(float fieldnum) entityfieldname
+Return name of the specified field as a string, or empty if the field is invalid (warning)
+=========
+*/
+void VM_entityfieldname(void)
+{
+	ddef_t *d;
+	int i = (int)PRVM_G_FLOAT(OFS_PARM0);
+	
+	if (i < 0 || i >= prog->progs->numfielddefs)
+	{
+        VM_Warning("VM_entityfieldname: %s: field index out of bounds\n", PRVM_NAME);
+        PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString("");
+		return;
+	}
+	
+	d = &prog->fielddefs[i];
+	PRVM_G_INT(OFS_RETURN) = d->s_name; // presuming that s_name points to a string already
+}
+
+// KrimZon - DP_QC_ENTITYDATA
+/*
+=========
+VM_entityfieldtype
+
+float(float fieldnum) entityfieldtype
+=========
+*/
+void VM_entityfieldtype(void)
+{
+	ddef_t *d;
+	int i = (int)PRVM_G_FLOAT(OFS_PARM0);
+	
+	if (i < 0 || i >= prog->progs->numfielddefs)
+	{
+		VM_Warning("VM_entityfieldtype: %s: field index out of bounds\n", PRVM_NAME);
+		PRVM_G_FLOAT(OFS_RETURN) = -1.0;
+		return;
+	}
+	
+	d = &prog->fielddefs[i];
+	PRVM_G_FLOAT(OFS_RETURN) = (float)d->type;
+}
+
+// KrimZon - DP_QC_ENTITYDATA
+/*
+=========
+VM_getentityfieldstring
+
+string(float fieldnum, entity ent) getentityfieldstring
+=========
+*/
+void VM_getentityfieldstring(void)
+{
+	// put the data into a string
+	ddef_t *d;
+	int type, j;
+	int *v;
+	prvm_edict_t * ent;
+	int i = (int)PRVM_G_FLOAT(OFS_PARM0);
+	
+	if (i < 0 || i >= prog->progs->numfielddefs)
+	{
+        VM_Warning("VM_entityfielddata: %s: field index out of bounds\n", PRVM_NAME);
+		PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString("");
+		return;
+	}
+	
+	d = &prog->fielddefs[i];
+	
+	// get the entity
+	ent = PRVM_G_EDICT(OFS_PARM1);
+	if(ent->priv.required->free)
+	{
+		PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString("");
+		VM_Warning("VM_entityfielddata: %s: entity %i is free !\n", PRVM_NAME, PRVM_NUM_FOR_EDICT(ent));
+		return;
+	}
+	v = (int *)((char *)ent->fields.vp + d->ofs*4);
+	
+	// if it's 0 or blank, return an empty string
+	type = d->type & ~DEF_SAVEGLOBAL;
+	for (j=0 ; j<prvm_type_size[type] ; j++)
+		if (v[j])
+			break;
+	if (j == prvm_type_size[type])
+	{
+		PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString("");
+		return;
+	}
+		
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(PRVM_UglyValueString((etype_t)d->type, (prvm_eval_t *)v));
+}
+
+// KrimZon - DP_QC_ENTITYDATA
+/*
+=========
+VM_putentityfieldstring
+
+float(float fieldnum, entity ent, string s) putentityfieldstring
+=========
+*/
+void VM_putentityfieldstring(void)
+{
+	ddef_t *d;
+	prvm_edict_t * ent;
+	int i = (int)PRVM_G_FLOAT(OFS_PARM0);
+
+	if (i < 0 || i >= prog->progs->numfielddefs)
+	{
+        VM_Warning("VM_entityfielddata: %s: field index out of bounds\n", PRVM_NAME);
+		PRVM_G_FLOAT(OFS_RETURN) = 0.0f;
+		return;
+	}
+
+	d = &prog->fielddefs[i];
+
+	// get the entity
+	ent = PRVM_G_EDICT(OFS_PARM1);
+	if(ent->priv.required->free)
+	{
+		VM_Warning("VM_entityfielddata: %s: entity %i is free !\n", PRVM_NAME, PRVM_NUM_FOR_EDICT(ent));
+		PRVM_G_FLOAT(OFS_RETURN) = 0.0f;
+		return;
+	}
+
+	// parse the string into the value
+	PRVM_G_FLOAT(OFS_RETURN) = ( PRVM_ED_ParseEpair(ent, d, PRVM_G_STRING(OFS_PARM2), false) ) ? 1.0f : 0.0f;
+}
+
 /*
 =========
 VM_strlen
@@ -1773,9 +1998,7 @@ void VM_strdecolorize(void)
 	// Prepare Strings
 	VM_SAFEPARMCOUNT(1,VM_strdecolorize);
 	szString = PRVM_G_STRING(OFS_PARM0);
-
 	COM_StringDecolorize(szString, 0, szNewString, sizeof(szNewString), TRUE);
-
 	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(szNewString);
 }
 
@@ -1878,7 +2101,7 @@ string	substring(string s, float start, float length)
 // returns a section of a string as a tempstring
 void VM_substring(void)
 {
-	int i, start, length;
+	int start, length, slength, maxlen;
 	const char *s;
 	char string[VM_STRINGTEMP_LENGTH];
 
@@ -1887,10 +2110,19 @@ void VM_substring(void)
 	s = PRVM_G_STRING(OFS_PARM0);
 	start = (int)PRVM_G_FLOAT(OFS_PARM1);
 	length = (int)PRVM_G_FLOAT(OFS_PARM2);
-	for (i = 0;i < start && *s;i++, s++);
-	for (i = 0;i < (int)sizeof(string) - 1 && *s && i < length;i++, s++)
-		string[i] = *s;
-	string[i] = 0;
+	slength = strlen(s);
+
+	if (start < 0) // FTE_STRINGS feature
+		start += slength;
+	start = bound(0, start, slength);
+
+	if (length < 0) // FTE_STRINGS feature
+		length += slength - start + 1;
+	maxlen = min((int)sizeof(string) - 1, slength - start);
+	length = bound(0, length, maxlen);
+
+	memcpy(string, s + start, length);
+	string[length] = 0;
 	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(string);
 }
 
@@ -2088,24 +2320,67 @@ 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
 //20040203: rewritten by LordHavoc (no longer uses allocations)
-int num_tokens = 0;
-int tokens[256];
+static int num_tokens = 0;
+static int tokens[VM_STRINGTEMP_LENGTH / 2];
+static int tokens_startpos[VM_STRINGTEMP_LENGTH / 2];
+static int tokens_endpos[VM_STRINGTEMP_LENGTH / 2];
+static char tokenize_string[VM_STRINGTEMP_LENGTH];
 void VM_tokenize (void)
 {
 	const char *p;
-	static char string[VM_STRINGTEMP_LENGTH]; // static, because it's big
 
 	VM_SAFEPARMCOUNT(1,VM_tokenize);
 
-	strlcpy(string, PRVM_G_STRING(OFS_PARM0), sizeof(string));
-	p = string;
+	strlcpy(tokenize_string, PRVM_G_STRING(OFS_PARM0), sizeof(tokenize_string));
+	p = tokenize_string;
+
+	num_tokens = 0;
+	for(;;)
+	{
+		if (num_tokens >= (int)(sizeof(tokens)/sizeof(tokens[0])))
+			break;
+
+		// skip whitespace here to find token start pos
+		while(*p && ISWHITESPACE(*p))
+			++p;
+
+		tokens_startpos[num_tokens] = p - tokenize_string;
+		if(!COM_ParseToken_VM_Tokenize(&p, false))
+			break;
+		tokens_endpos[num_tokens] = p - tokenize_string;
+		tokens[num_tokens] = PRVM_SetTempString(com_token);
+		++num_tokens;
+	}
+
+	PRVM_G_FLOAT(OFS_RETURN) = num_tokens;
+}
+
+//float(string s) tokenize = #514; // takes apart a string into individal words (access them with argv), returns how many
+void VM_tokenize_console (void)
+{
+	const char *p;
+
+	VM_SAFEPARMCOUNT(1,VM_tokenize);
+
+	strlcpy(tokenize_string, PRVM_G_STRING(OFS_PARM0), sizeof(tokenize_string));
+	p = tokenize_string;
 
 	num_tokens = 0;
-	while(COM_ParseToken_VM_Tokenize(&p, false))
+	for(;;)
 	{
 		if (num_tokens >= (int)(sizeof(tokens)/sizeof(tokens[0])))
 			break;
-		tokens[num_tokens++] = PRVM_SetTempString(com_token);
+
+		// skip whitespace here to find token start pos
+		while(*p && ISWHITESPACE(*p))
+			++p;
+
+		tokens_startpos[num_tokens] = p - tokenize_string;
+		if(!COM_ParseToken_Console(&p))
+			break;
+		tokens_endpos[num_tokens] = p - tokenize_string;
+		tokens[num_tokens] = PRVM_SetTempString(com_token);
+		++num_tokens;
 	}
 
 	PRVM_G_FLOAT(OFS_RETURN) = num_tokens;
@@ -2131,17 +2406,16 @@ void VM_tokenizebyseparator (void)
 	int numseparators;
 	int separatorlen[7];
 	const char *separators[7];
-	const char *p;
+	const char *p, *p0;
 	const char *token;
 	char tokentext[MAX_INPUTLINE];
-	static char string[VM_STRINGTEMP_LENGTH]; // static, because it's big
 
 	VM_SAFEPARMCOUNTRANGE(2, 8,VM_tokenizebyseparator);
 
-	strlcpy(string, PRVM_G_STRING(OFS_PARM0), sizeof(string));
-	p = string;
+	strlcpy(tokenize_string, PRVM_G_STRING(OFS_PARM0), sizeof(tokenize_string));
+	p = tokenize_string;
 
-	numseparators = 0;;
+	numseparators = 0;
 	for (j = 1;j < prog->argc;j++)
 	{
 		// skip any blank separator strings
@@ -2159,6 +2433,8 @@ void VM_tokenizebyseparator (void)
 	while (num_tokens < (int)(sizeof(tokens)/sizeof(tokens[0])))
 	{
 		token = tokentext + j;
+		tokens_startpos[num_tokens] = p - tokenize_string;
+		p0 = p;
 		while (*p)
 		{
 			for (k = 0;k < numseparators;k++)
@@ -2174,7 +2450,9 @@ void VM_tokenizebyseparator (void)
 			if (j < (int)sizeof(tokentext)-1)
 				tokentext[j++] = *p;
 			p++;
+			p0 = p;
 		}
+		tokens_endpos[num_tokens] = p0 - tokenize_string;
 		if (j >= (int)sizeof(tokentext))
 			break;
 		tokentext[j++] = 0;
@@ -2196,12 +2474,51 @@ void VM_argv (void)
 
 	token_num = (int)PRVM_G_FLOAT(OFS_PARM0);
 
+	if(token_num < 0)
+		token_num += num_tokens;
+
 	if (token_num >= 0 && token_num < num_tokens)
 		PRVM_G_INT(OFS_RETURN) = tokens[token_num];
 	else
 		PRVM_G_INT(OFS_RETURN) = OFS_NULL;
 }
 
+//float(float n) argv_start_index = #515; // returns the start index of a token
+void VM_argv_start_index (void)
+{
+	int token_num;
+
+	VM_SAFEPARMCOUNT(1,VM_argv);
+
+	token_num = (int)PRVM_G_FLOAT(OFS_PARM0);
+
+	if(token_num < 0)
+		token_num += num_tokens;
+
+	if (token_num >= 0 && token_num < num_tokens)
+		PRVM_G_FLOAT(OFS_RETURN) = tokens_startpos[token_num];
+	else
+		PRVM_G_FLOAT(OFS_RETURN) = -1;
+}
+
+//float(float n) argv_end_index = #516; // returns the end index of a token
+void VM_argv_end_index (void)
+{
+	int token_num;
+
+	VM_SAFEPARMCOUNT(1,VM_argv);
+
+	token_num = (int)PRVM_G_FLOAT(OFS_PARM0);
+
+	if(token_num < 0)
+		token_num += num_tokens;
+
+	if (token_num >= 0 && token_num < num_tokens)
+		PRVM_G_FLOAT(OFS_RETURN) = tokens_endpos[token_num];
+	else
+		PRVM_G_FLOAT(OFS_RETURN) = -1;
+}
+
 /*
 =========
 VM_isserver
@@ -2285,23 +2602,6 @@ void VM_getostype(void)
 #endif
 }
 
-/*
-=========
-VM_getmousepos
-
-vector	getmousepos()
-=========
-*/
-void VM_getmousepos(void)
-{
-
-	VM_SAFEPARMCOUNT(0,VM_getmousepos);
-
-	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;
-}
-
 /*
 =========
 VM_gettime
@@ -2309,11 +2609,44 @@ VM_gettime
 float	gettime(void)
 =========
 */
+extern double host_starttime;
+float CDAudio_GetPosition(void);
 void VM_gettime(void)
 {
-	VM_SAFEPARMCOUNT(0,VM_gettime);
+	int timer_index;
+
+	VM_SAFEPARMCOUNTRANGE(0,1,VM_gettime);
 
-	PRVM_G_FLOAT(OFS_RETURN) = (float) realtime;
+	if(prog->argc == 0)
+	{
+		PRVM_G_FLOAT(OFS_RETURN) = (float) realtime;
+	}
+	else
+	{
+		timer_index = (int) PRVM_G_FLOAT(OFS_PARM0);
+        switch(timer_index)
+        {
+            case 0: // GETTIME_FRAMESTART
+                PRVM_G_FLOAT(OFS_RETURN) = (float) realtime;
+                break;
+            case 1: // GETTIME_REALTIME
+                PRVM_G_FLOAT(OFS_RETURN) = (float) Sys_DoubleTime();
+                break;
+            case 2: // GETTIME_HIRES
+                PRVM_G_FLOAT(OFS_RETURN) = (float) (Sys_DoubleTime() - realtime);
+                break;
+            case 3: // GETTIME_UPTIME
+                PRVM_G_FLOAT(OFS_RETURN) = (float) (Sys_DoubleTime() - host_starttime);
+                break;
+            case 4: // GETTIME_CDTRACK
+                PRVM_G_FLOAT(OFS_RETURN) = (float) CDAudio_GetPosition();
+                break;
+			default:
+				VM_Warning("VM_gettime: %s: unsupported timer specified, returning realtime\n", PRVM_NAME);
+				PRVM_G_FLOAT(OFS_RETURN) = (float) realtime;
+				break;
+		}
+	}
 }
 
 /*
@@ -2465,7 +2798,10 @@ void VM_search_begin(void)
 	if(!(prog->opensearches[handle] = FS_Search(pattern,caseinsens, quiet)))
 		PRVM_G_FLOAT(OFS_RETURN) = -1;
 	else
+	{
+		prog->opensearches_origin[handle] = PRVM_AllocationOrigin();
 		PRVM_G_FLOAT(OFS_RETURN) = handle;
+	}
 }
 
 /*
@@ -2495,6 +2831,8 @@ void VM_search_end(void)
 
 	FS_FreeSearch(prog->opensearches[handle]);
 	prog->opensearches[handle] = NULL;
+	if(prog->opensearches_origin[handle])
+		PRVM_Free((char *)prog->opensearches_origin[handle]);
 }
 
 /*
@@ -2640,7 +2978,7 @@ dp_font_t *getdrawfont()
 {
 	if(prog->globaloffsets.drawfont >= 0)
 	{
-		int f = PRVM_G_FLOAT(prog->globaloffsets.drawfont);
+		int f = (int) PRVM_G_FLOAT(prog->globaloffsets.drawfont);
 		if(f < 0 || f >= MAX_FONTS)
 			return FONT_DEFAULT;
 		return &dp_fonts[f];
@@ -2755,7 +3093,7 @@ void VM_drawcolorcodedstring(void)
 	string = PRVM_G_STRING(OFS_PARM1);
 	pos = PRVM_G_VECTOR(OFS_PARM0);
 	scale = PRVM_G_VECTOR(OFS_PARM2);
-	flag = (int)PRVM_G_FLOAT(OFS_PARM5);
+	flag = (int)PRVM_G_FLOAT(OFS_PARM4);
 
 	if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
 	{
@@ -2842,6 +3180,51 @@ void VM_drawpic(void)
 }
 /*
 =========
+VM_drawrotpic
+
+float	drawrotpic(vector position, string pic, vector size, vector org, float angle, vector rgb, float alpha, float flag)
+=========
+*/
+void VM_drawrotpic(void)
+{
+	const char *picname;
+	float *size, *pos, *org, *rgb;
+	int flag;
+
+	VM_SAFEPARMCOUNT(8,VM_drawrotpic);
+
+	picname = PRVM_G_STRING(OFS_PARM1);
+	VM_CheckEmptyString (picname);
+
+	// is pic cached ? no function yet for that
+	if(!1)
+	{
+		PRVM_G_FLOAT(OFS_RETURN) = -4;
+		VM_Warning("VM_drawrotpic: %s: %s not cached !\n", PRVM_NAME, picname);
+		return;
+	}
+
+	pos = PRVM_G_VECTOR(OFS_PARM0);
+	size = PRVM_G_VECTOR(OFS_PARM2);
+	org = PRVM_G_VECTOR(OFS_PARM3);
+	rgb = PRVM_G_VECTOR(OFS_PARM5);
+	flag = (int) PRVM_G_FLOAT(OFS_PARM7);
+
+	if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
+	{
+		PRVM_G_FLOAT(OFS_RETURN) = -2;
+		VM_Warning("VM_drawrotpic: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
+		return;
+	}
+
+	if(pos[2] || size[2] || org[2])
+		Con_Printf("VM_drawrotpic: z value from pos/size/org discarded\n");
+
+	DrawQ_RotPic(pos[0], pos[1], Draw_CachePic(picname), size[0], size[1], org[0], org[1], PRVM_G_FLOAT(OFS_PARM4), rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM6), flag);
+	PRVM_G_FLOAT(OFS_RETURN) = 1;
+}
+/*
+=========
 VM_drawsubpic
 
 float	drawsubpic(vector position, vector size, string pic, vector srcPos, vector srcSize, vector rgb, float alpha, float flag)
@@ -3001,6 +3384,40 @@ void VM_keynumtostring (void)
 	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(Key_KeynumToString((int)PRVM_G_FLOAT(OFS_PARM0)));
 }
 
+/*
+=========
+VM_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(const char *command, int *keys);
+void VM_findkeysforcommand(void)
+{
+	const char *cmd;
+	char ret[VM_STRINGTEMP_LENGTH];
+	int keys[NUMKEYS];
+	int i;
+
+	VM_SAFEPARMCOUNT(1, VM_findkeysforcommand);
+
+	cmd = PRVM_G_STRING(OFS_PARM0);
+
+	VM_CheckEmptyString(cmd);
+
+	M_FindKeysForCommand(cmd, keys);
+
+	ret[0] = 0;
+	for(i = 0; i < NUMKEYS; i++)
+		strlcat(ret, va(" \'%i\'", keys[i]), sizeof(ret));
+
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(ret);
+}
+
 /*
 =========
 VM_stringtokeynum
@@ -3287,7 +3704,7 @@ void VM_gecko_keyevent( void ) {
 		return;
 	}
 
-	PRVM_G_FLOAT( OFS_RETURN ) = (CL_Gecko_Event_Key( instance, key, eventtype ) == true);
+	PRVM_G_FLOAT( OFS_RETURN ) = (CL_Gecko_Event_Key( instance, (keynum_t) key, eventtype ) == true);
 }
 
 /*
@@ -3340,7 +3757,7 @@ void VM_gecko_resize( void ) {
 	if( !instance ) {
 		return;
 	}
-	CL_Gecko_Resize( instance, w, h );
+	CL_Gecko_Resize( instance, (int) w, (int) h );
 }
 
 
@@ -3673,7 +4090,7 @@ static void BufStr_Expand(prvm_stringbuffer_t *stringbuffer, int strindex)
 		stringbuffer->max_strings = max(stringbuffer->max_strings * 2, 128);
 		while (stringbuffer->max_strings <= strindex)
 			stringbuffer->max_strings *= 2;
-		stringbuffer->strings = Mem_Alloc(prog->progs_mempool, stringbuffer->max_strings * sizeof(stringbuffer->strings[0]));
+		stringbuffer->strings = (char **) Mem_Alloc(prog->progs_mempool, stringbuffer->max_strings * sizeof(stringbuffer->strings[0]));
 		if (stringbuffer->num_strings > 0)
 			memcpy(stringbuffer->strings, oldstrings, stringbuffer->num_strings * sizeof(stringbuffer->strings[0]));
 		if (oldstrings)
@@ -3729,8 +4146,9 @@ void VM_buf_create (void)
 	prvm_stringbuffer_t *stringbuffer;
 	int i;
 	VM_SAFEPARMCOUNT(0, VM_buf_create);
-	stringbuffer = Mem_ExpandableArray_AllocRecord(&prog->stringbuffersarray);
+	stringbuffer = (prvm_stringbuffer_t *) Mem_ExpandableArray_AllocRecord(&prog->stringbuffersarray);
 	for (i = 0;stringbuffer != Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, i);i++);
+	stringbuffer->origin = PRVM_AllocationOrigin();
 	PRVM_G_FLOAT(OFS_RETURN) = i;
 }
 
@@ -3754,6 +4172,8 @@ void VM_buf_del (void)
 				Mem_Free(stringbuffer->strings[i]);
 		if (stringbuffer->strings)
 			Mem_Free(stringbuffer->strings);
+		if(stringbuffer->origin)
+			PRVM_Free((char *)stringbuffer->origin);
 		Mem_ExpandableArray_FreeRecord(&prog->stringbuffersarray, stringbuffer);
 	}
 	else
@@ -4076,6 +4496,91 @@ void VM_bufstr_free (void)
 	BufStr_Shrink(stringbuffer);
 }
 
+
+
+
+
+
+
+void VM_buf_cvarlist(void)
+{
+	cvar_t *cvar;
+	const char *partial, *antipartial;
+	size_t len, antilen;
+	size_t alloclen;
+	qboolean ispattern, antiispattern;
+	int n;
+	prvm_stringbuffer_t	*stringbuffer;
+	VM_SAFEPARMCOUNTRANGE(2, 3, VM_buf_cvarlist);
+
+	stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
+	if(!stringbuffer)
+	{
+		VM_Warning("VM_bufstr_free: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
+		return;
+	}
+
+	partial = PRVM_G_STRING(OFS_PARM1);
+	if(!partial)
+		len = 0;
+	else
+		len = strlen(partial);
+
+	if(prog->argc == 3)
+		antipartial = PRVM_G_STRING(OFS_PARM2);
+	else
+		antipartial = NULL;
+	if(!antipartial)
+		antilen = 0;
+	else
+		antilen = strlen(antipartial);
+	
+	for (n = 0;n < stringbuffer->num_strings;n++)
+		if (stringbuffer->strings[n])
+			Mem_Free(stringbuffer->strings[n]);
+	if (stringbuffer->strings)
+		Mem_Free(stringbuffer->strings);
+	stringbuffer->strings = NULL;
+
+	ispattern = partial && (strchr(partial, '*') || strchr(partial, '?'));
+	antiispattern = antipartial && (strchr(antipartial, '*') || strchr(antipartial, '?'));
+
+	n = 0;
+	for(cvar = cvar_vars; cvar; cvar = cvar->next)
+	{
+		if(len && (ispattern ? !matchpattern_with_separator(cvar->name, partial, false, "", false) : strncmp(partial, cvar->name, len)))
+			continue;
+
+		if(antilen && (antiispattern ? matchpattern_with_separator(cvar->name, antipartial, false, "", false) : !strncmp(antipartial, cvar->name, antilen)))
+			continue;
+
+		++n;
+	}
+
+	stringbuffer->max_strings = stringbuffer->num_strings = n;
+	if (stringbuffer->max_strings)
+		stringbuffer->strings = (char **)Mem_Alloc(prog->progs_mempool, sizeof(stringbuffer->strings[0]) * stringbuffer->max_strings);
+	
+	n = 0;
+	for(cvar = cvar_vars; cvar; cvar = cvar->next)
+	{
+		if(len && (ispattern ? !matchpattern_with_separator(cvar->name, partial, false, "", false) : strncmp(partial, cvar->name, len)))
+			continue;
+
+		if(antilen && (antiispattern ? matchpattern_with_separator(cvar->name, antipartial, false, "", false) : !strncmp(antipartial, cvar->name, antilen)))
+			continue;
+
+		alloclen = strlen(cvar->name) + 1;
+		stringbuffer->strings[n] = (char *)Mem_Alloc(prog->progs_mempool, alloclen);
+		memcpy(stringbuffer->strings[n], cvar->name, alloclen);
+
+		++n;
+	}
+}
+
+
+
+
 //=============
 
 /*
@@ -4200,50 +4705,18 @@ void VM_changepitch (void)
 	PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.angles)->vector[0] = ANGLEMOD (current + move);
 }
 
-// TODO: adapt all static function names to use a single naming convention... [12/3/2007 Black]
-static int Is_Text_Color (char c, char t)
-{
-	int a = 0;
-	char c2 = c - (c & 128);
-	char t2 = t - (t & 128);
-
-	if(c != STRING_COLOR_TAG && c2 != STRING_COLOR_TAG)		return 0;
-	if(t >= '0' && t <= '9')		a = 1;
-	if(t2 >= '0' && t2 <= '9')		a = 1;
-/*	if(t >= 'A' && t <= 'Z')		a = 2;
-	if(t2 >= 'A' && t2 <= 'Z')		a = 2;
-
-	if(a == 1 && scr_colortext.integer > 0)
-		return 1;
-	if(a == 2 && scr_multifonts.integer > 0)
-		return 2;
-*/
-	return a;
-}
 
 void VM_uncolorstring (void)
 {
-	const char	*in;
-	char		out[VM_STRINGTEMP_LENGTH];
-	int			k = 0, i = 0;
+	char szNewString[VM_STRINGTEMP_LENGTH];
+	const char *szString;
 
+	// Prepare Strings
 	VM_SAFEPARMCOUNT(1, VM_uncolorstring);
-	in = PRVM_G_STRING(OFS_PARM0);
-	VM_CheckEmptyString (in);
-
-	while (in[k])
-	{
-		if(in[k+1])
-		if(Is_Text_Color(in[k], in[k+1]) == 1/* || (in[k] == '&' && in[k+1] == 'r')*/)
-		{
-			k += 2;
-			continue;
-		}
-		out[i] = in[k];
-		++k;
-		++i;
-	}
-	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(out);
+	szString = PRVM_G_STRING(OFS_PARM0);
+	COM_StringDecolorize(szString, 0, szNewString, sizeof(szNewString), TRUE);
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(szNewString);
+	
 }
 
 // #221 float(string str, string sub[, float startpos]) strstrofs (FTE_STRINGS)
@@ -4255,7 +4728,7 @@ void VM_strstrofs (void)
 	VM_SAFEPARMCOUNTRANGE(2, 3, VM_strstrofs);
 	instr = PRVM_G_STRING(OFS_PARM0);
 	match = PRVM_G_STRING(OFS_PARM1);
-	firstofs = (prog->argc > 2)?PRVM_G_FLOAT(OFS_PARM2):0;
+	firstofs = (prog->argc > 2)?(int)PRVM_G_FLOAT(OFS_PARM2):0;
 
 	if (firstofs && (firstofs < 0 || firstofs > (int)strlen(instr)))
 	{
@@ -4384,9 +4857,9 @@ void VM_strconv (void)
 
 	VM_SAFEPARMCOUNTRANGE(3, 8, VM_strconv);
 
-	ccase = PRVM_G_FLOAT(OFS_PARM0);	//0 same, 1 lower, 2 upper
-	redalpha = PRVM_G_FLOAT(OFS_PARM1);	//0 same, 1 white, 2 red,  5 alternate, 6 alternate-alternate
-	rednum = PRVM_G_FLOAT(OFS_PARM2);	//0 same, 1 white, 2 red, 3 redspecial, 4 whitespecial, 5 alternate, 6 alternate-alternate
+	ccase = (int) PRVM_G_FLOAT(OFS_PARM0);	//0 same, 1 lower, 2 upper
+	redalpha = (int) PRVM_G_FLOAT(OFS_PARM1);	//0 same, 1 white, 2 red,  5 alternate, 6 alternate-alternate
+	rednum = (int) PRVM_G_FLOAT(OFS_PARM2);	//0 same, 1 white, 2 red, 3 redspecial, 4 whitespecial, 5 alternate, 6 alternate-alternate
 	VM_VarString(3, (char *) resbuf, sizeof(resbuf));
 	len = strlen((char *) resbuf);
 
@@ -4429,7 +4902,7 @@ void VM_strpad (void)
 	char destbuf[VM_STRINGTEMP_LENGTH];
 	int pad;
 	VM_SAFEPARMCOUNTRANGE(1, 8, VM_strpad);
-	pad = PRVM_G_FLOAT(OFS_PARM0);
+	pad = (int) PRVM_G_FLOAT(OFS_PARM0);
 	VM_VarString(1, src, sizeof(src));
 
 	// note: < 0 = left padding, > 0 = right padding,
@@ -4580,3 +5053,186 @@ void VM_Cmd_Reset(void)
 //	VM_BufStr_ShutDown();
 }
 
+// #510 string(string input, ...) uri_escape (DP_QC_URI_ESCAPE)
+// does URI escaping on a string (replace evil stuff by %AB escapes)
+void VM_uri_escape (void)
+{
+	char src[VM_STRINGTEMP_LENGTH];
+	char dest[VM_STRINGTEMP_LENGTH];
+	char *p, *q;
+	static const char *hex = "0123456789ABCDEF";
+
+	VM_SAFEPARMCOUNTRANGE(1, 8, VM_uri_escape);
+	VM_VarString(0, src, sizeof(src));
+
+	for(p = src, q = dest; *p && q < dest + sizeof(dest) - 3; ++p)
+	{
+		if((*p >= 'A' && *p <= 'Z')
+			|| (*p >= 'a' && *p <= 'z')
+			|| (*p >= '0' && *p <= '9')
+			|| (*p == '-')  || (*p == '_') || (*p == '.')
+			|| (*p == '!')  || (*p == '~') || (*p == '*')
+			|| (*p == '\'') || (*p == '(') || (*p == ')'))
+			*q++ = *p;
+		else
+		{
+			*q++ = '%';
+			*q++ = hex[(*(unsigned char *)p >> 4) & 0xF];
+			*q++ = hex[ *(unsigned char *)p       & 0xF];
+		}
+	}
+	*q++ = 0;
+
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(dest);
+}
+
+// #510 string(string input, ...) uri_unescape (DP_QC_URI_ESCAPE)
+// does URI unescaping on a string (get back the evil stuff)
+void VM_uri_unescape (void)
+{
+	char src[VM_STRINGTEMP_LENGTH];
+	char dest[VM_STRINGTEMP_LENGTH];
+	char *p, *q;
+	int hi, lo;
+
+	VM_SAFEPARMCOUNTRANGE(1, 8, VM_uri_unescape);
+	VM_VarString(0, src, sizeof(src));
+
+	for(p = src, q = dest; *p; ) // no need to check size, because unescape can't expand
+	{
+		if(*p == '%')
+		{
+			if(p[1] >= '0' && p[1] <= '9')
+				hi = p[1] - '0';
+			else if(p[1] >= 'a' && p[1] <= 'f')
+				hi = p[1] - 'a' + 10;
+			else if(p[1] >= 'A' && p[1] <= 'F')
+				hi = p[1] - 'A' + 10;
+			else
+				goto nohex;
+			if(p[2] >= '0' && p[2] <= '9')
+				lo = p[2] - '0';
+			else if(p[2] >= 'a' && p[2] <= 'f')
+				lo = p[2] - 'a' + 10;
+			else if(p[2] >= 'A' && p[2] <= 'F')
+				lo = p[2] - 'A' + 10;
+			else
+				goto nohex;
+			if(hi != 0 || lo != 0) // don't unescape NUL bytes
+				*q++ = (char) (hi * 0x10 + lo);
+			p += 3;
+			continue;
+		}
+
+nohex:
+		// otherwise:
+		*q++ = *p++;
+	}
+	*q++ = 0;
+
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(dest);
+}
+
+// #502 string(string filename) whichpack (DP_QC_WHICHPACK)
+// returns the name of the pack containing a file, or "" if it is not in any pack (but local or non-existant)
+void VM_whichpack (void)
+{
+	const char *fn, *pack;
+
+	VM_SAFEPARMCOUNT(1, VM_whichpack);
+	fn = PRVM_G_STRING(OFS_PARM0);
+	pack = FS_WhichPack(fn);
+
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(pack ? pack : "");
+}
+
+typedef struct
+{
+	int prognr;
+	double starttime;
+	float id;
+	char buffer[MAX_INPUTLINE];
+}
+uri_to_prog_t;
+
+static void uri_to_string_callback(int status, size_t length_received, unsigned char *buffer, void *cbdata)
+{
+	uri_to_prog_t *handle = (uri_to_prog_t *) cbdata;
+
+	if(!PRVM_ProgLoaded(handle->prognr))
+	{
+		// curl reply came too late... so just drop it
+		Z_Free(handle);
+		return;
+	}
+		
+	PRVM_SetProg(handle->prognr);
+	PRVM_Begin;
+		if((prog->starttime == handle->starttime) && (prog->funcoffsets.URI_Get_Callback))
+		{
+			if(length_received >= sizeof(handle->buffer))
+				length_received = sizeof(handle->buffer) - 1;
+			handle->buffer[length_received] = 0;
+		
+			PRVM_G_FLOAT(OFS_PARM0) = handle->id;
+			PRVM_G_FLOAT(OFS_PARM1) = status;
+			PRVM_G_INT(OFS_PARM2) = PRVM_SetTempString(handle->buffer);
+			PRVM_ExecuteProgram(prog->funcoffsets.URI_Get_Callback, "QC function URI_Get_Callback is missing");
+		}
+	PRVM_End;
+	
+	Z_Free(handle);
+}
+
+// uri_get() gets content from an URL and calls a callback "uri_get_callback" with it set as string; an unique ID of the transfer is returned
+// returns 1 on success, and then calls the callback with the ID, 0 or the HTTP status code, and the received data in a string
+void VM_uri_get (void)
+{
+	const char *url;
+	float id;
+	qboolean ret;
+	uri_to_prog_t *handle;
+
+	if(!prog->funcoffsets.URI_Get_Callback)
+		PRVM_ERROR("uri_get called by %s without URI_Get_Callback defined", PRVM_NAME);
+
+	VM_SAFEPARMCOUNT(2, VM_uri_get);
+
+	url = PRVM_G_STRING(OFS_PARM0);
+	id = PRVM_G_FLOAT(OFS_PARM1);
+	handle = (uri_to_prog_t *) Z_Malloc(sizeof(*handle)); // this can't be the prog's mem pool, as curl may call the callback later!
+
+	handle->prognr = PRVM_GetProgNr();
+	handle->starttime = prog->starttime;
+	handle->id = id;
+	ret = Curl_Begin_ToMemory(url, (unsigned char *) handle->buffer, sizeof(handle->buffer), uri_to_string_callback, handle);
+	if(ret)
+	{
+		PRVM_G_INT(OFS_RETURN) = 1;
+	}
+	else
+	{
+		Z_Free(handle);
+		PRVM_G_INT(OFS_RETURN) = 0;
+	}
+}
+
+void VM_netaddress_resolve (void)
+{
+	const char *ip;
+	char normalized[128];
+	int port;
+	lhnetaddress_t addr;
+
+	VM_SAFEPARMCOUNTRANGE(1, 2, VM_netaddress_resolve);
+
+	ip = PRVM_G_STRING(OFS_PARM0);
+	port = 0;
+	if(prog->argc > 1)
+		port = (int) PRVM_G_FLOAT(OFS_PARM1);
+
+	if(LHNETADDRESS_FromString(&addr, ip, port) && LHNETADDRESS_ToString(&addr, normalized, sizeof(normalized), prog->argc > 1))
+		PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(normalized);
+	else
+		PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString("");
+}