]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - prvm_cmds.c
-Added 2 builtins to make the hostcache stuff easier extensible.
[xonotic/darkplaces.git] / prvm_cmds.c
index 4b0afb0d7efbc72015824ad4eab01dd345a162bb..4bf7209baf33608520d2fe9e019921914a62f968 100644 (file)
@@ -1,7 +1,7 @@
 // AK
 // Basically every vm builtin cmd should be in here.
-// All 3 builtin list and extension lists can be found here
-// cause large (I think they will) are from pr_cmds the same copyright like in pr_cms
+// All 3 builtin and extension lists can be found here
+// cause large (I think they will) parts are from pr_cmds the same copyright like in pr_cmds
 // also applies here
 
 
@@ -57,7 +57,7 @@ float sin(float)
 float  cos(float)
 float  sqrt(float)
 vector randomvec()
-float  registercvar (string name, string value)
+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)
@@ -82,6 +82,28 @@ float        clientstate()
                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)
+string altstr_set(string altstr, float num, string set)
                
 perhaps only : Menu : WriteMsg 
 ===============================
@@ -95,8 +117,8 @@ perhaps only : Menu : WriteMsg
                WriteString(string data, float dest, float desto)
                WriteEntity(entity data, float dest, float desto)
                
-Client & Menu : draw functions 
-===============================
+Client & Menu : draw functions & video functions
+===================================================
 
 float  iscachedpic(string pic)
 string precache_pic(string pic) 
@@ -105,23 +127,57 @@ float     drawcharacter(vector position, float character, vector scale, vector rgb,
 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
+float  getkeydest()
                setmousetarget(float target)
-float  getmousetarget(void)
+float  getmousetarget()
+
+               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  gethostcachestat(float type)
+string gethostcachestring(float fld, float hostnr)
+
+               parseentitydata(entity ent, string data)
+
+float  stringtokeynum(string key)
+
+               resethostcachemasks()
+               sethostcachemaskstring(float mask, float fld, string str)
+               sethostcachemasknumber(float mask, float fld, float num, float op)
+               resorthostcache()
+               sethostcachesort(float field, float descending)
+               refreshhostcache()
+float  gethostcachenumber(float fld, float hostnr)
+float  gethostcacheindexforkey(string key)
+               addwantedhostcachekey(string key)
 */
 
 #include "quakedef.h"
 #include "progdefs.h"
+#include "progsvm.h"
 #include "clprogdefs.h"
 #include "mprogdefs.h"
 
+#include "cl_video.h"
+
 //============================================================================
 // nice helper macros
 
@@ -147,16 +203,11 @@ 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 STRINGTEMP_BUFFERS 16
-#define STRINGTEMP_LENGTH 4096
-static char vm_string_temp[STRINGTEMP_BUFFERS][STRINGTEMP_LENGTH];
+#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;
 
-// qc cvar 
-#define MAX_QC_CVARS 128 * PRVM_MAXPROGS
-cvar_t vm_qc_cvar[MAX_QC_CVARS];
-int vm_currentqc_cvar;
-
 // qc file handling
 #define MAX_VMFILES            256
 #define MAX_PRVMFILES  MAX_VMFILES * PRVM_MAXPROGS
@@ -164,11 +215,18 @@ int vm_currentqc_cvar;
 
 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];
+
 static char *VM_GetTempString(void)
 {
        char *s;
        s = vm_string_temp[vm_string_tempindex];
-       vm_string_tempindex = (vm_string_tempindex + 1) % STRINGTEMP_BUFFERS;
+       vm_string_tempindex = (vm_string_tempindex + 1) % VM_STRINGTEMP_BUFFERS;
        return s;
 }
 
@@ -252,14 +310,14 @@ error(value)
 void VM_error (void)
 {
        prvm_edict_t    *ed;
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
 
        VM_VarString(0, string, sizeof(string));
-       Con_Printf ("======%S ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string);
+       Con_Printf("======%S ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string);
        if(prog->self)
        {
                ed = PRVM_G_EDICT(prog->self->ofs);
-               PRVM_ED_Print (ed);
+               PRVM_ED_Print(ed);
        }
 
        PRVM_ERROR ("%s: Program error", PRVM_NAME);
@@ -278,14 +336,14 @@ objerror(value)
 void VM_objerror (void)
 {
        prvm_edict_t    *ed;
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
 
        VM_VarString(0, string, sizeof(string));
-       Con_Printf ("======%s OBJECT ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string);
+       Con_Printf("======%s OBJECT ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string);
        if(prog->self)
        {
                ed = PRVM_G_EDICT (prog->self->ofs);
-               PRVM_ED_Print (ed);
+               PRVM_ED_Print(ed);
 
                PRVM_ED_Free (ed);
        }
@@ -305,7 +363,7 @@ print(string)
 */
 void VM_print (void)
 {
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
 
        VM_VarString(0, string, sizeof(string));
        Con_Print(string);
@@ -322,16 +380,16 @@ bprint(...[string])
 */
 void VM_bprint (void)
 {
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
 
        if(!sv.active)
        {
-               Con_Printf("VM_bprint: game is not server(%s) !", PRVM_NAME);
+               Con_Printf("VM_bprint: game is not server(%s) !\n", PRVM_NAME);
                return;
        }
 
        VM_VarString(0, string, sizeof(string));
-       SV_BroadcastPrintf("%s", string);
+       SV_BroadcastPrint(string);
 }
 
 /*
@@ -347,19 +405,17 @@ void VM_sprint (void)
 {
        client_t        *client;
        int                     clientnum;
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
 
        //find client for this entity
        clientnum = PRVM_G_FLOAT(OFS_PARM0);
        if (!sv.active  || clientnum < 0 || clientnum >= svs.maxclients || !svs.clients[clientnum].active)
        {
-               Con_Printf("VM_sprint: %s: invalid client or server is not active !", PRVM_NAME);
+               Con_Printf("VM_sprint: %s: invalid client or server is not active !\n", PRVM_NAME);
                return;
        }
        
        client = svs.clients + clientnum;
-       if (!client->netconnection)
-               return;
        VM_VarString(1, string, sizeof(string));
        MSG_WriteChar(&client->message,svc_print);
        MSG_WriteString(&client->message, string);
@@ -376,7 +432,7 @@ centerprint(clientent, value)
 */
 void VM_centerprint (void)
 {
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
 
        VM_VarString(0, string, sizeof(string));
        SCR_CenterPrint(string);
@@ -527,13 +583,9 @@ float random()
 */
 void VM_random (void)
 {
-       float           num;
-
        VM_SAFEPARMCOUNT(0,VM_random);
 
-       num = (rand ()&0x7fff) / ((float)0x7fff);
-
-       PRVM_G_FLOAT(OFS_RETURN) = num;
+       PRVM_G_FLOAT(OFS_RETURN) = lhrandom(0, 1);
 }
 
 /*
@@ -594,14 +646,13 @@ void VM_localsound(void)
 
        s = PRVM_G_STRING(OFS_PARM0);
 
-       if(!S_GetCached(s))
+       if(!S_LocalSound (s))
        {
-               Con_Printf("VM_localsound: %s : %s not cached !\n", PRVM_NAME, s);
+               Con_Printf("VM_localsound: Failed to play %s for %s !\n", s, PRVM_NAME);
                PRVM_G_FLOAT(OFS_RETURN) = -4;
                return;
        }               
 
-       S_LocalSound(s);
        PRVM_G_FLOAT(OFS_RETURN) = 1;
 }
 
@@ -650,6 +701,35 @@ void VM_cvar (void)
        PRVM_G_FLOAT(OFS_RETURN) = Cvar_VariableValue(PRVM_G_STRING(OFS_PARM0));
 }
 
+/*
+=================
+VM_str_cvar
+
+const string   str_cvar (string)
+=================
+*/
+void VM_str_cvar(void) 
+{
+       char *out, *name;
+       const char *cvar_string;
+       VM_SAFEPARMCOUNT(1,VM_str_cvar);
+
+       name = PRVM_G_STRING(OFS_PARM0);
+
+       if(!name)
+               PRVM_ERROR("VM_str_cvar: %s: null string\n", PRVM_NAME);
+
+       VM_CheckEmptyString(name);
+
+       out = VM_GetTempString(); 
+
+       cvar_string = Cvar_VariableString(name);
+       
+       strcpy(out, cvar_string);
+
+       PRVM_G_INT(OFS_RETURN) = PRVM_SetString(out);
+}
+
 /*
 =================
 VM_cvar_set
@@ -673,7 +753,7 @@ dprint(...[string])
 */
 void VM_dprint (void)
 {
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
        if (developer.integer)
        {
                VM_VarString(0, string, sizeof(string));
@@ -771,11 +851,43 @@ float stof(...[string])
 */
 void VM_stof(void)
 {
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
        VM_VarString(0, string, sizeof(string));
        PRVM_G_FLOAT(OFS_RETURN) = atof(string);
 }
 
+/*
+========================
+VM_itof
+
+float itof(intt ent)
+========================
+*/
+void VM_itof(void)
+{
+       VM_SAFEPARMCOUNT(1, VM_itof);
+       PRVM_G_FLOAT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0);
+}
+
+/*
+========================
+VM_itoe
+
+intt ftoi(float num)
+========================
+*/
+void VM_ftoi(void)
+{
+       int ent;
+       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);
+    
+       PRVM_G_INT(OFS_RETURN) = ent;
+}
+
 /*
 =========
 VM_spawn
@@ -796,7 +908,7 @@ void VM_spawn (void)
 =========
 VM_remove
 
-entity remove()
+remove(entity e)
 =========
 */
 
@@ -847,7 +959,7 @@ void VM_find (void)
        {
                prog->xfunction->builtinsprofile++;
                ed = PRVM_EDICT_NUM(e);
-               if (ed->e->free)
+               if (ed->p.e->free)
                        continue;
                t = PRVM_E_STRING(ed,f);
                if (!t)
@@ -859,7 +971,7 @@ void VM_find (void)
                }
        }
 
-       VM_RETURN_EDICT(sv.edicts);
+       VM_RETURN_EDICT(prog->edicts);
 }
 
 /*
@@ -888,7 +1000,7 @@ void VM_findfloat (void)
        {
                prog->xfunction->builtinsprofile++;
                ed = PRVM_EDICT_NUM(e);
-               if (ed->e->free)
+               if (ed->p.e->free)
                        continue;
                if (PRVM_E_FLOAT(ed,f) == s)
                {
@@ -940,7 +1052,7 @@ void VM_findchain (void)
        for (i = 1;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent))
        {
                prog->xfunction->builtinsprofile++;
-               if (ent->e->free)
+               if (ent->p.e->free)
                        continue;
                t = PRVM_E_STRING(ent,f);
                if (!t)
@@ -948,7 +1060,7 @@ void VM_findchain (void)
                if (strcmp(t,s))
                        continue;
 
-               PRVM_E_FLOAT(ent,chain_of) = PRVM_NUM_FOR_EDICT(chain);
+               PRVM_E_INT(ent,chain_of) = PRVM_NUM_FOR_EDICT(chain);
                chain = ent;
        }
 
@@ -989,12 +1101,12 @@ void VM_findchainfloat (void)
        for (i = 1;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent))
        {
                prog->xfunction->builtinsprofile++;
-               if (ent->e->free)
+               if (ent->p.e->free)
                        continue;
-               if (E_FLOAT(ent,f) != s)
+               if (PRVM_E_FLOAT(ent,f) != s)
                        continue;
 
-               PRVM_E_FLOAT(ent,chain_of) = PRVM_NUM_FOR_EDICT(chain);
+               PRVM_E_INT(ent,chain_of) = PRVM_EDICT_TO_PROG(chain);
                chain = ent;
        }
 
@@ -1044,15 +1156,9 @@ void VM_precache_sound (void)
        s = PRVM_G_STRING(OFS_PARM0);
        PRVM_G_INT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0);
        VM_CheckEmptyString (s);
-       
-       if(S_GetCached(s))
-       {
-               Con_Printf("VM_precache_sound: %s already cached (%s)\n", s, PRVM_NAME);
-               return;
-       }
-       
-       if(!S_PrecacheSound(s,true))
-               Con_Printf("VM_prache_sound: Failed to load %s for %s\n", s, PRVM_NAME);
+
+       if(snd_initialized.integer && !S_PrecacheSound (s,true, true))
+               Con_Printf("VM_precache_sound: Failed to load %s for %s\n", s, PRVM_NAME);
 }
 
 /*
@@ -1066,7 +1172,39 @@ void VM_coredump (void)
 {
        VM_SAFEPARMCOUNT(0,VM_coredump);
 
-       PRVM_ED_PrintEdicts_f ();
+       Cbuf_AddText("prvm_edicts ");
+       Cbuf_AddText(PRVM_NAME);
+       Cbuf_AddText("\n");
+}
+
+/*
+=========
+VM_stackdump
+
+stackdump()
+=========
+*/
+void PRVM_StackTrace(void);
+void VM_stackdump (void)
+{
+       VM_SAFEPARMCOUNT(0, VM_stackdump);
+
+       PRVM_StackTrace();
+}
+
+/*
+=========
+VM_crash
+
+crash()
+=========
+*/
+
+void VM_crash(void) 
+{
+       VM_SAFEPARMCOUNT(0, VM_crash);
+
+       PRVM_ERROR("Crash called by %s\n",PRVM_NAME);
 }
 
 /*
@@ -1183,7 +1321,7 @@ void VM_nextent (void)
                        return;
                }
                ent = PRVM_EDICT_NUM(i);
-               if (!ent->e->free)
+               if (!ent->p.e->free)
                {
                        VM_RETURN_EDICT(ent);
                        return;
@@ -1224,8 +1362,8 @@ sizebuf_t *VM_WriteDest (void)
 
        case MSG_ONE:
                destclient = (int) PRVM_G_FLOAT(OFS_PARM2);
-               if (!sv.active  || destclient < 0 || destclient >= svs.maxclients || !svs.clients[destclient].active)
-                       PRVM_ERROR("VM_clientcommand: %s: invalid client/server is not active !", PRVM_NAME);
+               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;
 
@@ -1265,12 +1403,12 @@ void VM_WriteLong (void)
 
 void VM_WriteAngle (void)
 {
-       MSG_WriteAngle (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0));
+       MSG_WriteAngle (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0), sv.protocol);
 }
 
 void VM_WriteCoord (void)
 {
-       MSG_WriteDPCoord (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0));
+       MSG_WriteCoord (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0), sv.protocol);
 }
 
 void VM_WriteString (void)
@@ -1394,19 +1532,24 @@ void VM_randomvec (void)
 =========
 VM_registercvar
 
-float  registercvar (string name, string value)
+float  registercvar (string name, string value, float flags)
 =========
 */
 void VM_registercvar (void)
 {
        char *name, *value;
-       cvar_t *variable;
+       int     flags;
 
-       VM_SAFEPARMCOUNT(2,VM_registercvar);
+       VM_SAFEPARMCOUNT(3,VM_registercvar);
 
        name = PRVM_G_STRING(OFS_PARM0);
        value = PRVM_G_STRING(OFS_PARM1);
+       flags = PRVM_G_FLOAT(OFS_PARM2);
        PRVM_G_FLOAT(OFS_RETURN) = 0;
+
+       if(flags > CVAR_MAXFLAGSVAL)
+               return;
+
 // first check to see if it has already been defined
        if (Cvar_FindVar (name))
                return;
@@ -1414,22 +1557,12 @@ void VM_registercvar (void)
 // check for overlap with a command
        if (Cmd_Exists (name))
        {
-               Con_Printf ("VM_registercvar: %s is a command\n", name);
+               Con_Printf("VM_registercvar: %s is a command\n", name);
                return;
        }
 
-       if (vm_currentqc_cvar >= MAX_QC_CVARS)
-               PRVM_ERROR ("VM_registercvar: ran out of cvar slots (%i)\n", MAX_QC_CVARS);
+       Cvar_Get(name, value, flags);
 
-// copy the name and value
-       variable = &vm_qc_cvar[vm_currentqc_cvar++];
-       variable->name = Z_Malloc (strlen(name)+1);
-       strcpy (variable->name, name);
-       variable->string = Z_Malloc (strlen(value)+1);
-       strcpy (variable->string, value);
-       variable->value = atof (value);
-
-       Cvar_RegisterVariable(variable);
        PRVM_G_FLOAT(OFS_RETURN) = 1; // success
 }
 
@@ -1481,7 +1614,7 @@ void VM_max (void)
                for (i = 1;i < prog->argc;i++)
                        if (PRVM_G_FLOAT((OFS_PARM0+i*3)) > f)
                                f = PRVM_G_FLOAT((OFS_PARM0+i*3));
-               G_FLOAT(OFS_RETURN) = f;
+               PRVM_G_FLOAT(OFS_RETURN) = f;
        }
        else
                PRVM_ERROR("VM_max: %s must supply at least 2 floats\n", PRVM_NAME);
@@ -1555,7 +1688,7 @@ setcolor(clientent, value)
 
        if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
        {
-               Con_Print("tried to setcolor a non-client\n");
+               Con_Print("tried to setcolor a non-client\n");
                return;
        }
 
@@ -1627,7 +1760,7 @@ 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;
        }
@@ -1638,11 +1771,14 @@ void VM_fopen(void)
        // \ 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: dangerous or non-portable filename \"%s\" not allowed. (contains : or \\ or begins with .. or /)\n", 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);
+       if (VM_FILES[filenum] == NULL && mode == 0)
+               VM_FILES[filenum] = FS_Open(va("%s", filename), modestring, false);
+
        if (VM_FILES[filenum] == NULL)
                PRVM_G_FLOAT(OFS_RETURN) = -1;
        else
@@ -1689,7 +1825,7 @@ string    fgets(float fhandle)
 void VM_fgets(void)
 {
        int c, end;
-       static char string[STRINGTEMP_LENGTH];
+       static char string[VM_STRINGTEMP_LENGTH];
        int filenum;
 
        VM_SAFEPARMCOUNT(1,VM_fgets);
@@ -1711,16 +1847,16 @@ void VM_fgets(void)
                c = FS_Getc(VM_FILES[filenum]);
                if (c == '\r' || c == '\n' || c < 0)
                        break;
-               if (end < STRINGTEMP_LENGTH - 1)
+               if (end < VM_STRINGTEMP_LENGTH - 1)
                        string[end++] = c;
        }
        string[end] = 0;
        // remove \n following \r
        if (c == '\r')
                c = FS_Getc(VM_FILES[filenum]);
-       if (developer.integer)
+       if (developer.integer >= 3)
                Con_Printf("fgets: %s: %s\n", PRVM_NAME, string);
-       if (c >= 0)
+       if (c >= 0 || end)
                PRVM_G_INT(OFS_RETURN) = PRVM_SetString(string);
        else
                PRVM_G_INT(OFS_RETURN) = 0;
@@ -1737,7 +1873,7 @@ fputs(float fhandle, string s)
 void VM_fputs(void)
 {
        int stringlength;
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
        int filenum;
 
        VM_SAFEPARMCOUNT(2,VM_fputs);
@@ -1795,11 +1931,11 @@ void VM_strcat(void)
 {
        char *s;
 
-       if(prog->argc <= 2
-               PRVM_ERROR("VM_strcat wrong parameter count (min. 2 expected ) !\n");
+       if(prog->argc < 1
+               PRVM_ERROR("VM_strcat wrong parameter count (min. 1 expected ) !\n");
        
        s = VM_GetTempString();
-       VM_VarString(0, s, STRINGTEMP_LENGTH);
+       VM_VarString(0, s, VM_STRINGTEMP_LENGTH);
        PRVM_G_INT(OFS_RETURN) = PRVM_SetString(s);
 }
 
@@ -1826,7 +1962,7 @@ void VM_substring(void)
        if (!s)
                s = "";
        for (i = 0;i < start && *s;i++, s++);
-       for (i = 0;i < STRINGTEMP_LENGTH - 1 && *s && i < length;i++, s++)
+       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);
@@ -1842,7 +1978,7 @@ vector    stov(string s)
 //vector(string s) stov = #117; // returns vector value from a string
 void VM_stov(void)
 {
-       char string[STRINGTEMP_LENGTH];
+       char string[VM_STRINGTEMP_LENGTH];
 
        VM_SAFEPARMCOUNT(1,VM_stov);
 
@@ -1880,9 +2016,14 @@ 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);
 
-       Mem_Free(PRVM_G_STRING(OFS_PARM0));
+       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 );
 }
 
 /*
@@ -1904,7 +2045,7 @@ void VM_clcommand (void)
        i = PRVM_G_FLOAT(OFS_PARM0);
        if (!sv.active  || i < 0 || i >= svs.maxclients || !svs.clients[i].active)
        {
-               Con_Printf("VM_clientcommand: %s: invalid client/server is not active !", PRVM_NAME);
+               Con_Printf("VM_clientcommand: %s: invalid client/server is not active !\n", PRVM_NAME);
                return;
        }
 
@@ -2011,6 +2152,7 @@ void PF_setattachment (void)
                                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;
+                       // 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))
@@ -2065,431 +2207,1658 @@ void VM_clientstate(void)
        PRVM_G_FLOAT(OFS_RETURN) = cls.state;
 }
 
-//=============================================================================
-// Draw builtins (client & menu)
+/*
+=========
+VM_getostype
+
+float  getostype(void)
+=========
+*/ // not used at the moment -> not included in the common list
+void VM_getostype(void)
+{
+       VM_SAFEPARMCOUNT(0,VM_getostype);
+
+       /*
+       OS_WINDOWS
+       OS_LINUX
+       OS_MAC - not supported
+       */
+
+#ifdef _WIN32
+       PRVM_G_FLOAT(OFS_RETURN) = 0;
+#elif defined _MAC
+       PRVM_G_FLOAT(OFS_RETURN) = 2;
+#else
+       PRVM_G_FLOAT(OFS_RETURN) = 1;
+#endif
+}
 
 /*
 =========
-VM_iscachedpic
+VM_getmousepos
 
-float  iscachedpic(string pic)
+vector getmousepos()
 =========
 */
-void VM_iscachedpic(void)
+void VM_getmousepos(void)
 {
-       VM_SAFEPARMCOUNT(1,VM_iscachedpic);
 
-       // drawq hasnt such a function, thus always return true 
-       PRVM_G_FLOAT(OFS_RETURN) = TRUE;
+       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)[2] = 0;
 }
 
 /*
 =========
-VM_precache_pic
+VM_gettime
 
-string precache_pic(string pic) 
+float  gettime(void)
 =========
 */
-void VM_precache_pic(void)
+void VM_gettime(void)
 {
-       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");
+       VM_SAFEPARMCOUNT(0,VM_gettime);
 
-       VM_CheckEmptyString (s);
-       
-       Draw_CachePic(s); 
+       PRVM_G_FLOAT(OFS_RETURN) = (float) *prog->time;
 }
 
 /*
 =========
-VM_freepic
+VM_loadfromdata
 
-freepic(string s)
+loadfromdata(string data)
 =========
 */
-void VM_freepic(void)
+void VM_loadfromdata(void)
 {
-       char *s;
+       VM_SAFEPARMCOUNT(1,VM_loadentsfromfile);
 
-       VM_SAFEPARMCOUNT(1,VM_freepic);
+       PRVM_ED_LoadFromFile(PRVM_G_STRING(OFS_PARM0));
+}
 
-       s = PRVM_G_STRING(OFS_PARM0);
-       
-       if(!s)
-               PRVM_ERROR ("VM_freepic: %s: NULL\n");
-       
-       VM_CheckEmptyString (s);
-       
-       Draw_FreePic(s);
+/*
+========================
+VM_M_parseentitydata
+
+parseentitydata(entity ent, string data)
+========================
+*/
+void VM_M_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));
+
+       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_ED_ParseEdict (data, ent);
 }
 
 /*
 =========
-VM_drawcharacter
+VM_loadfromfile
 
-float  drawcharacter(vector position, float character, vector scale, vector rgb, float alpha, float flag)
+loadfromfile(string file)
 =========
 */
-void VM_drawcharacter(void)
+void VM_loadfromfile(void)
 {
-       float *pos,*scale,*rgb;
-       char   character;
-       int flag;
-       VM_SAFEPARMCOUNT(6,VM_drawcharacter);
-
-       character = (char) PRVM_G_FLOAT(OFS_PARM1);
-       if(character == 0)
-       {
-               Con_Printf("VM_drawcharacter: %s passed null character !\n",PRVM_NAME);
-               PRVM_G_FLOAT(OFS_RETURN) = -1;
-               return;
-       }
+       char *filename;
+       qbyte *data;
        
-       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);
+       VM_SAFEPARMCOUNT(1,VM_loadfromfile);
        
-       if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
+       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_drawcharacter: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
-               PRVM_G_FLOAT(OFS_RETURN) = -2;
+               Con_Printf("VM_loadfromfile: %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;
        }
+
+       // not conform with VM_fopen
+       data = FS_LoadFile(filename, tempmempool, false);
+       if (data == NULL)
+               PRVM_G_FLOAT(OFS_RETURN) = -1;
        
-       if(pos[2] || scale[2])
-               Con_Printf("VM_drawcharacter: z value%c from %s discarded",(pos[2] && scale[2]) ? 's' : 0,((pos[2] && scale[2]) ? "pos and scale" : (pos[2] ? "pos" : "scale"))); 
+       PRVM_ED_LoadFromFile(data);
 
-       if(!scale[0] || !scale[1])
-       {
-               Con_Printf("VM_drawcharacter: scale %s is null !\n", (scale[0] == 0) ? ((scale[1] == 0) ? "x and y" : "x") : "y");
-               PRVM_G_FLOAT(OFS_RETURN) = -3;
-               return;
-       }
+       if(data)
+               Mem_Free(data);
+}
 
-       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;
-}      
 
 /*
 =========
-VM_drawstring
+VM_modulo
 
-float  drawstring(vector position, string text, vector scale, vector rgb, float alpha, float flag)
+float  mod(float val, float m)
 =========
 */
-void VM_drawstring(void)
+void VM_modulo(void)
 {
-       float *pos,*scale,*rgb;
-       char  *string;
-       int flag;
-       VM_SAFEPARMCOUNT(6,VM_drawstring);
+       int val, m;
+       VM_SAFEPARMCOUNT(2,VM_module);
+
+       val = (int) PRVM_G_FLOAT(OFS_PARM0);
+       m       = (int) PRVM_G_FLOAT(OFS_PARM1);
+
+       PRVM_G_FLOAT(OFS_RETURN) = (float) (val % m);
+}
+
+void VM_Search_Init(void)
+{
+       memset(VM_SEARCHLIST,0,sizeof(fssearch_t*[MAX_VMSEARCHES]));
+}
+
+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]));
+}
+
+/*
+=========
+VM_search_begin
+
+float search_begin(string pattern, float caseinsensitive, float quiet)
+=========
+*/
+void VM_search_begin(void)
+{
+       int handle;
+       char *pattern;
+       int caseinsens, quiet;
+
+       VM_SAFEPARMCOUNT(3, VM_search_begin);
+
+       pattern = PRVM_G_STRING(OFS_PARM0);
+
+       VM_CheckEmptyString(pattern);
+
+       caseinsens = PRVM_G_FLOAT(OFS_PARM1);
+       quiet = PRVM_G_FLOAT(OFS_PARM2);
        
-       string = PRVM_G_STRING(OFS_PARM1);
-       if(!string)
+       for(handle = 0; handle < MAX_VMSEARCHES; handle++)
+               if(!VM_SEARCHLIST[handle])
+                       break;
+
+       if(handle >= MAX_VMSEARCHES)
        {
-               Con_Printf("VM_drawstring: %s passed null string !\n",PRVM_NAME);
-               PRVM_G_FLOAT(OFS_RETURN) = -1;
+               Con_Printf("VM_search_begin: %s ran out of search handles (%i)\n", PRVM_NAME, MAX_VMSEARCHES);
+               PRVM_G_FLOAT(OFS_RETURN) = -2;
                return;
        }
+
+       if(!(VM_SEARCHLIST[handle] = FS_Search(pattern,caseinsens, quiet)))
+               PRVM_G_FLOAT(OFS_RETURN) = -1;
+       else
+               PRVM_G_FLOAT(OFS_RETURN) = handle;
+}
+
+/*
+=========
+VM_search_end
+
+void   search_end(float handle)
+=========
+*/
+void VM_search_end(void)
+{
+       int handle;
+       VM_SAFEPARMCOUNT(1, VM_search_end);
+
+       handle = PRVM_G_FLOAT(OFS_PARM0);
        
-       VM_CheckEmptyString(string);
-       
-       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)
+       if(handle < 0 || handle >= MAX_VMSEARCHES)
        {
-               Con_Printf("VM_drawstring: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
-               PRVM_G_FLOAT(OFS_RETURN) = -2;
+               Con_Printf("VM_search_end: invalid handle %i used in %s\n", handle, PRVM_NAME);
                return;
        }
-       
-       if(!scale[0] || !scale[1])
+       if(VM_SEARCHLIST[handle] == NULL)
        {
-               Con_Printf("VM_drawstring: scale %s is null !\n", (scale[0] == 0) ? ((scale[1] == 0) ? "x and y" : "x") : "y");
-               PRVM_G_FLOAT(OFS_RETURN) = -3;
+               Con_Printf("VM_search_end: no such handle %i in %s\n", handle, PRVM_NAME);
                return;
        }
 
-       if(pos[2] || scale[2])
-               Con_Printf("VM_drawstring: z value%c from %s discarded",(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;
+       FS_FreeSearch(VM_SEARCHLIST[handle]);
+       VM_SEARCHLIST[handle] = NULL;
 }
+
 /*
 =========
-VM_drawpic
+VM_search_getsize
 
-float  drawpic(vector position, string pic, vector size, vector rgb, float alpha, float flag)
+float  search_getsize(float handle)
 =========
 */
-void VM_drawpic(void)
+void VM_search_getsize(void)
 {
-       char *pic;
+       int handle;
+       VM_SAFEPARMCOUNT(1, VM_M_search_getsize);
+
+       handle = PRVM_G_FLOAT(OFS_PARM0);
+
+       if(handle < 0 || handle >= MAX_VMSEARCHES)
+       {
+               Con_Printf("VM_search_getsize: invalid handle %i used in %s\n", handle, PRVM_NAME);
+               return;
+       }
+       if(VM_SEARCHLIST[handle] == NULL)
+       {
+               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;
+}
+
+/*
+=========
+VM_search_getfilename
+
+string search_getfilename(float handle, float num)
+=========
+*/
+void VM_search_getfilename(void)
+{
+       int handle, filenum;
+       char *tmp;
+       VM_SAFEPARMCOUNT(2, VM_search_getfilename);
+
+       handle = PRVM_G_FLOAT(OFS_PARM0);
+       filenum = PRVM_G_FLOAT(OFS_PARM1);
+
+       if(handle < 0 || handle >= MAX_VMSEARCHES)
+       {
+               Con_Printf("VM_search_getfilename: invalid handle %i used in %s\n", handle, PRVM_NAME);
+               return;
+       }
+       if(VM_SEARCHLIST[handle] == NULL)
+       {
+               Con_Printf("VM_search_getfilename: no such handle %i in %s\n", handle, PRVM_NAME);
+               return;
+       }
+       if(filenum < 0 || filenum >= VM_SEARCHLIST[handle]->numfilenames)
+       {
+               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);
+}
+
+/*
+=========
+VM_chr
+
+string chr(float ascii)
+=========
+*/
+void VM_chr(void)
+{
+       char *tmp;
+       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_SetString(tmp);
+}
+
+//=============================================================================
+// Draw builtins (client & menu)
+
+/*
+=========
+VM_iscachedpic
+
+float  iscachedpic(string pic)
+=========
+*/
+void VM_iscachedpic(void)
+{
+       VM_SAFEPARMCOUNT(1,VM_iscachedpic);
+
+       // drawq hasnt such a function, thus always return true 
+       PRVM_G_FLOAT(OFS_RETURN) = false;
+}
+
+/*
+=========
+VM_precache_pic
+
+string precache_pic(string pic) 
+=========
+*/
+void VM_precache_pic(void)
+{
+       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);
+
+       VM_CheckEmptyString (s);
+       
+       if(!Draw_CachePic(s))
+               PRVM_G_INT(OFS_RETURN) = PRVM_SetString(""); 
+}
+
+/*
+=========
+VM_freepic
+
+freepic(string s)
+=========
+*/
+void VM_freepic(void)
+{
+       char *s;
+
+       VM_SAFEPARMCOUNT(1,VM_freepic);
+
+       s = PRVM_G_STRING(OFS_PARM0);
+       
+       if(!s)
+               PRVM_ERROR ("VM_freepic: %s: NULL\n");
+       
+       VM_CheckEmptyString (s);
+       
+       Draw_FreePic(s);
+}
+
+/*
+=========
+VM_drawcharacter
+
+float  drawcharacter(vector position, float character, vector scale, vector rgb, float alpha, float flag)
+=========
+*/
+void VM_drawcharacter(void)
+{
+       float *pos,*scale,*rgb;
+       char   character;
+       int flag;
+       VM_SAFEPARMCOUNT(6,VM_drawcharacter);
+
+       character = (char) PRVM_G_FLOAT(OFS_PARM1);
+       if(character == 0)
+       {
+               Con_Printf("VM_drawcharacter: %s passed null character !\n",PRVM_NAME);
+               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"))); 
+
+       if(!scale[0] || !scale[1])
+       {
+               Con_Printf("VM_drawcharacter: scale %s is null !\n", (scale[0] == 0) ? ((scale[1] == 0) ? "x and y" : "x") : "y");
+               PRVM_G_FLOAT(OFS_RETURN) = -3;
+               return;
+       }
+
+       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;
+}      
+
+/*
+=========
+VM_drawstring
+
+float  drawstring(vector position, string text, vector scale, vector rgb, float alpha, float flag)
+=========
+*/
+void VM_drawstring(void)
+{
+       float *pos,*scale,*rgb;
+       char  *string;
+       int flag;
+       VM_SAFEPARMCOUNT(6,VM_drawstring);
+       
+       string = PRVM_G_STRING(OFS_PARM1);
+       if(!string)
+       {
+               Con_Printf("VM_drawstring: %s passed null string !\n",PRVM_NAME);
+               PRVM_G_FLOAT(OFS_RETURN) = -1;
+               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);
+       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");
+               PRVM_G_FLOAT(OFS_RETURN) = -3;
+               return;
+       }
+
+       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"))); 
+       
+       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;
+}
+/*
+=========
+VM_drawpic
+
+float  drawpic(vector position, string pic, vector size, vector rgb, float alpha, float flag)
+=========
+*/
+void VM_drawpic(void)
+{
+       char *pic;
        float *size, *pos, *rgb;
        int flag;
 
-       VM_SAFEPARMCOUNT(6,VM_drawpic);
+       VM_SAFEPARMCOUNT(6,VM_drawpic);
+
+       pic = PRVM_G_STRING(OFS_PARM1);
+
+       if(!pic)
+       {
+               Con_Printf("VM_drawpic: %s passed null picture name !\n", PRVM_NAME);
+               PRVM_G_FLOAT(OFS_RETURN) = -1;  
+               return;
+       }
+
+       VM_CheckEmptyString (pic);
+
+       // is pic cached ? no function yet for that
+       if(!1)
+       {
+               Con_Printf("VM_drawpic: %s: %s not cached !\n", PRVM_NAME, pic);
+               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);
+       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(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"))); 
+       
+       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;
+}
+
+/*
+=========
+VM_drawfill
+
+float drawfill(vector position, vector size, vector rgb, float alpha, float flag)
+=========
+*/
+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"))); 
+       
+       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;
+}
+
+/*
+=========
+VM_drawsetcliparea
+
+drawsetcliparea(float x, float y, float width, float height)
+=========
+*/
+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)); 
+
+       DrawQ_SetClipArea(x, y, w, h);
+}
+
+/*
+=========
+VM_drawresetcliparea
+
+drawresetcliparea()
+=========
+*/
+void VM_drawresetcliparea(void)
+{
+       VM_SAFEPARMCOUNT(0,VM_drawresetcliparea);
+
+       DrawQ_ResetClipArea();
+}
+
+/*
+=========
+VM_getimagesize
+
+vector getimagesize(string pic)
+=========
+*/
+void VM_getimagesize(void)
+{
+       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);
+       
+       VM_CheckEmptyString (p);
+
+       pic = Draw_CachePic (p);
+
+       PRVM_G_VECTOR(OFS_RETURN)[0] = pic->width;
+       PRVM_G_VECTOR(OFS_RETURN)[1] = pic->height;
+       PRVM_G_VECTOR(OFS_RETURN)[2] = 0;
+}
+
+// CL_Video interface functions
+
+/*
+========================
+VM_cin_open
+
+float cin_open(string file, string name)
+========================
+*/
+void VM_cin_open( void )
+{
+       char *file;
+       char *name;
+       
+       VM_SAFEPARMCOUNT( 2, VM_cin_open );
+       
+       file = PRVM_G_STRING( OFS_PARM0 );
+       name = PRVM_G_STRING( OFS_PARM1 );
+
+       VM_CheckEmptyString( file );
+    VM_CheckEmptyString( name );
+
+       if( CL_OpenVideo( file, name, MENUOWNER ) )
+               PRVM_G_FLOAT( OFS_RETURN ) = 1;
+       else
+               PRVM_G_FLOAT( OFS_RETURN ) = 0;
+}
+
+/*
+========================
+VM_cin_close
+
+void cin_close(string name)
+========================
+*/
+void VM_cin_close( void )
+{
+       char *name;
+
+       VM_SAFEPARMCOUNT( 1, VM_cin_close );
+
+       name = PRVM_G_STRING( OFS_PARM0 );
+       VM_CheckEmptyString( name );
+
+       CL_CloseVideo( CL_GetVideo( name ) ); 
+}
+
+/*
+========================
+VM_cin_setstate
+void cin_setstate(string name, float type)
+========================
+*/
+void VM_cin_setstate( void )
+{
+       char *name;
+       clvideostate_t  state;
+       clvideo_t               *video;
+
+       VM_SAFEPARMCOUNT( 2, VM_cin_netstate );
+
+       name = PRVM_G_STRING( OFS_PARM0 );
+       VM_CheckEmptyString( name );
+
+       state = PRVM_G_FLOAT( OFS_PARM1 );
+
+       video = CL_GetVideo( name );
+       if( video && state > CLVIDEO_UNUSED && state < CLVIDEO_STATECOUNT )
+               CL_SetVideoState( video, state );               
+}
+
+/*
+========================
+VM_cin_getstate
+
+float cin_getstate(string name)
+========================
+*/
+void VM_cin_getstate( void )
+{
+       char *name;
+       clvideo_t               *video;
+
+       VM_SAFEPARMCOUNT( 1, VM_cin_getstate );
+
+       name = PRVM_G_STRING( OFS_PARM0 );
+       VM_CheckEmptyString( name );
+
+       video = CL_GetVideo( name );
+       if( video )
+               PRVM_G_FLOAT( OFS_RETURN ) = (int)video->state;
+       else
+               PRVM_G_FLOAT( OFS_RETURN ) = 0;
+}
+
+/*
+========================
+VM_cin_restart
+
+void cin_restart(string name)
+========================
+*/
+void VM_cin_restart( void )
+{
+       char *name;
+       clvideo_t               *video;
+
+       VM_SAFEPARMCOUNT( 1, VM_cin_restart );
+
+       name = PRVM_G_STRING( OFS_PARM0 );
+       VM_CheckEmptyString( name );
+
+       video = CL_GetVideo( name );
+       if( video )
+               CL_RestartVideo( video );
+}
+
+////////////////////////////////////////
+// AltString functions
+////////////////////////////////////////
+
+/*
+========================
+VM_altstr_count
+
+float altstr_count(string)
+========================
+*/
+void VM_altstr_count( void )
+{
+       char *altstr, *pos;
+       int     count;
+
+       VM_SAFEPARMCOUNT( 1, VM_altstr_count );
+
+       altstr = PRVM_G_STRING( OFS_PARM0 );
+       //VM_CheckEmptyString( altstr );
+
+       for( count = 0, pos = altstr ; *pos ; pos++ )
+               if( *pos == '\\' && !*++pos )
+                               break;
+               else if( *pos == '\'' )
+                       count++;
+
+       PRVM_G_FLOAT( OFS_RETURN ) = (float) (count / 2);
+}
+
+/*
+========================
+VM_altstr_prepare
+
+string altstr_prepare(string)
+========================
+*/
+void VM_altstr_prepare( void )
+{
+       char *outstr, *out;
+       char *instr, *in;
+       int size;
+
+       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++ )
+               if( *in == '\'' ) {
+                       *out++ = '\\';
+                       *out = '\'';
+                       size--;
+               } else
+                       *out = *in;
+       *out = 0;
+
+       PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( outstr );
+}
+
+/*
+========================
+VM_altstr_get
+
+string altstr_get(string, float)
+========================
+*/
+void VM_altstr_get( void )
+{
+       char *altstr, *pos, *outstr, *out;
+       int count, size;
+
+       VM_SAFEPARMCOUNT( 2, VM_altstr_get );
+
+       altstr = PRVM_G_STRING( OFS_PARM0 );
+       //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 == '\'' )
+                       count--;
+
+       if( !*pos ) {
+               PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( "" );
+               return;
+       }
+
+    outstr = VM_GetTempString();
+       for( out = outstr, size = VM_STRINGTEMP_LENGTH - 1 ; size && *pos ; size--, pos++, out++ )
+               if( *pos == '\\' ) {
+                       if( !*++pos )
+                               break;
+                       *out = *pos;
+                       size--;
+               } else if( *pos == '\'' )
+                       break;
+               else
+                       *out = *pos;
+
+       *out = 0;
+       PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( outstr );
+}
+
+/*
+========================
+VM_altstr_set
+
+string altstr_set(string altstr, float num, string set)
+========================
+*/
+void VM_altstr_set( void )
+{
+    int num;
+       char *altstr, *str;
+       char *in;
+       char *outstr, *out;
+
+       VM_SAFEPARMCOUNT( 3, VM_altstr_set );
+
+       altstr = PRVM_G_STRING( OFS_PARM0 );
+       //VM_CheckEmptyString( altstr );
+
+       num = PRVM_G_FLOAT( OFS_PARM1 );
+
+       str = PRVM_G_STRING( OFS_PARM2 );
+       //VM_CheckEmptyString( str );
+
+       outstr = out = VM_GetTempString();
+       for( num = num * 2 + 1, in = altstr; *in && num; *out++ = *in++ )
+               if( *in == '\\' && !*++in )
+                       break;
+               else if( *in == '\'' )
+                       num--;
+
+       if( !in ) {
+               PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( "" );
+               return;
+       }
+       // copy set in
+       for( ; *str; *out++ = *str++ );
+       // now jump over the old contents
+       for( ; *in ; in++ )
+               if( *in == '\'' || *in == '\\' && !*++in )
+                       break;
+       
+       if( !in ) {
+               PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( "" );
+               return;
+       }
+
+       strcpy( out, in );
+       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;
+       }
+}
+
+/*
+=========
+VM_M_callfunction
+
+       callfunction(...,string function_name)
+Extension: pass 
+=========
+*/
+mfunction_t *PRVM_ED_FindFunction (const char *name);
+void VM_M_callfunction(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++;
+       }
+}      
+
+/*
+=========
+VM_M_isfunction
+
+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;
+}
+
+/*
+=========
+VM_M_writetofile
+
+       writetofile(float fhandle, entity ent)
+=========
+*/
+void VM_M_writetofile(void)
+{
+       prvm_edict_t * ent;
+       int filenum;
+
+       VM_SAFEPARMCOUNT(2, VM_M_writetofile);
+
+       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);
+               return;
+       }
+
+       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));
+               return;
+       }
+
+       PRVM_ED_Write (VM_FILES[filenum], ent);
+}
+
+/*
+=========
+VM_M_getresolution
+
+vector getresolution(float number)
+=========
+*/
+extern unsigned short video_resolutions[][2];
+void VM_M_getresolution(void)
+{
+       int nr;
+       VM_SAFEPARMCOUNT(1, VM_getresolution);
+
+       nr = PRVM_G_FLOAT(OFS_PARM0);
+
+
+       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);
+
+       tmp = VM_GetTempString();
+       
+       strcpy(tmp, Key_KeynumToString(keynum));
+
+       PRVM_G_INT(OFS_RETURN) = PRVM_SetString(tmp);
+}
+
+/*
+=========
+VM_M_stringtokeynum
+
+float stringtokeynum(string key)
+=========
+*/
+void VM_M_stringtokeynum( void )
+{
+       char *str;
+       VM_SAFEPARMCOUNT( 1, VM_M_keynumtostring );
+
+       str = PRVM_G_STRING( OFS_PARM0 );
+
+       PRVM_G_INT(OFS_RETURN) = Key_StringToKeynum( str );
+}
+
+/*
+=========
+VM_M_findkeysforcommand
+
+string findkeysforcommand(string command)
 
-       pic = PRVM_G_STRING(OFS_PARM1);
+the returned string is an altstring
+=========
+*/
+#define NUMKEYS 5 // TODO: merge the constant in keys.c with this one somewhen
 
-       if(!pic)
-       {
-               Con_Printf("VM_drawpic: %s passed null picture name !\n", PRVM_NAME);
-               PRVM_G_FLOAT(OFS_RETURN) = -1;  
-               return;
-       }
+void M_FindKeysForCommand(char *command, int *keys);
+void VM_M_findkeysforcommand(void)
+{
+       char *cmd, *ret;
+       int keys[NUMKEYS];
+       int i;
 
-       VM_CheckEmptyString (pic);
+       VM_SAFEPARMCOUNT(1, VM_M_findkeysforcommand);
 
-       // is pic cached ?
-       if(!1)
-       {
-               Con_Printf("VM_drawpic: %s: %s not cached !\n", PRVM_NAME, pic);
-               PRVM_G_FLOAT(OFS_RETURN) = -4;
-               return;
-       }
+       cmd = PRVM_G_STRING(OFS_PARM0);
        
-       pos = PRVM_G_VECTOR(OFS_PARM0);
-       size = 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;
-       }
+       VM_CheckEmptyString(cmd);
 
-       if(pos[2] || size[2])
-               Con_Printf("VM_drawstring: z value%c from %s discarded",(pos[2] && size[2]) ? 's' : 0,((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size"))); 
+       (ret = VM_GetTempString())[0] = 0;
        
-       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;
+       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);
 }
 
 /*
 =========
-VM_drawfill
+VM_M_gethostcachestat
 
-float drawfill(vector position, vector size, vector rgb, float alpha, float flag)
+float  gethostcachestat(float type)
 =========
 */
-void VM_drawfill(void)
+/*
+       type:
+0      hostcache_viewcount
+1   hostcache_totalcount
+2      masterquerycount
+3      masterreplycount
+4      serverquerycount
+5      serverreplycount
+6      sortfield
+7      sortdescending
+*/
+void VM_M_gethostcachestat( 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)
+       int type;
+       VM_SAFEPARMCOUNT ( 1, VM_M_gethostcachestat );
+
+       PRVM_G_FLOAT( OFS_RETURN ) = 0;
+
+       type = PRVM_G_FLOAT( OFS_PARM0 );
+       switch(type)
        {
-               Con_Printf("VM_drawstring: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
-               PRVM_G_FLOAT(OFS_RETURN) = -2;
+       case 0:
+               PRVM_G_FLOAT ( OFS_RETURN ) = hostcache_viewcount;
+               return;
+       case 1:
+               PRVM_G_FLOAT ( OFS_RETURN ) = hostcache_cachecount; 
+       case 2:
+               PRVM_G_FLOAT ( OFS_RETURN ) = masterquerycount;
+               return;
+       case 3:
+               PRVM_G_FLOAT ( OFS_RETURN ) = masterreplycount;
+               return;
+       case 4:
+               PRVM_G_FLOAT ( OFS_RETURN ) = serverquerycount;
+               return;
+       case 5:
+               PRVM_G_FLOAT ( OFS_RETURN ) = serverreplycount;
+               return;
+       case 6:
+               PRVM_G_FLOAT ( OFS_RETURN ) = hostcache_sortbyfield;
                return;
+       case 7:
+               PRVM_G_FLOAT ( OFS_RETURN ) = hostcache_sortdescending;
+               return;
+       default:
+               Con_Printf( "VM_M_gethostcachestat: bad type %i!\n", type );
        }
-       
-       if(pos[2] || size[2])
-               Con_Printf("VM_drawstring: z value%c from %s discarded",(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;
 }
 
 /*
-=========
-VM_getmousepos
+========================
+VM_M_resethostcachemasks
 
-vector getmousepos()
-=========
+resethostcachemasks()
+========================
 */
-void VM_getmousepos(void)
+void VM_M_resethostcachemasks( 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] = 0;
+       HostCache_ResetMasks();
 }
 
-void VM_Cmd_Init(void)
-{
-       // only init the stuff for the current prog
-       VM_STRINGS_MEMPOOL = Mem_AllocPool(va("vm_stringsmempool[%s]",PRVM_NAME));
-       VM_Files_Init();                
-}
 
-void VM_Cmd_Reset(void)
+/*
+========================
+VM_M_sethostcachemaskstring
+
+sethostcachemaskstring(float mask, float fld, string str, float op)
+0-511          and
+512 - 1024     or
+========================
+*/
+void VM_M_sethostcachemaskstring( void )
 {
-       Mem_EmptyPool(VM_STRINGS_MEMPOOL);
-       VM_Files_CloseAll();
-}
+       char *str;
+       int masknr;
+       hostcache_mask_t *mask;
+       int field;
+
+       VM_SAFEPARMCOUNT( 4, VM_M_sethostcachemaskstring );
+       str = PRVM_G_STRING( OFS_PARM1 );
+       if( !str )
+               PRVM_ERROR( "VM_M_sethostcachemaskstring: null string passed!" );
+
+       masknr = PRVM_G_FLOAT( OFS_PARM0 );
+       if( masknr >= 0 && masknr <= HOSTCACHE_ANDMASKCOUNT )
+               mask = &hostcache_andmasks[masknr];
+       else if( masknr >= 512 && masknr - 512 <= HOSTCACHE_ORMASKCOUNT )
+               mask = &hostcache_ormasks[masknr - 512 ];
+       else {
+               Con_Printf( "VM_M_sethostcachemaskstring: invalid mask number %i\n", masknr );
+               return;
+       }
 
-//============================================================================
-// Server
+       field = (int) PRVM_G_FLOAT( OFS_PARM1 );
+       
+       switch( field ) {
+               case HCIF_CNAME:
+                       strncpy( mask->info.cname, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.cname) );
+                       break;
+               case HCIF_NAME:
+                       strncpy( mask->info.name, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.name)  );
+                       break;
+               case HCIF_MAP:
+                       strncpy( mask->info.map, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.map)  );
+                       break;
+               case HCIF_MOD:
+                       strncpy( mask->info.mod, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.mod)  );
+                       break;
+               case HCIF_GAME:
+                       strncpy( mask->info.game, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.game)  );
+                       break;
+               default:
+                       Con_Printf( "VM_M_sethostcachemaskstring: Bad field number %i passed!\n", field );
+                       return;
+       }
 
-char *vm_sv_extensions =
-"";
+       mask->active = true;
+       mask->tests[field] = (int) PRVM_G_FLOAT( OFS_PARM3 );
+}    
 
-prvm_builtin_t vm_sv_builtins[] = {
-0  // to be consistent with the old vm
-};
+/*
+========================
+VM_M_sethostcachemasknumber
 
-const int vm_sv_numbuiltins = sizeof(vm_sv_builtins) / sizeof(prvm_builtin_t);
+sethostcachemasknumber(float mask, float fld, float num, float op)
 
-void VM_SV_Cmd_Init(void)
+0-511          and
+512 - 1024     or
+========================
+*/
+void VM_M_sethostcachemasknumber( void )
 {
-}
+       int number;
+       hostcache_mask_t *mask;
+       int     masknr;
+       int field;
+       VM_SAFEPARMCOUNT( 4, VM_M_sethostcachemasknumber );
 
-void VM_SV_Cmd_Reset(void)
-{
-}
+       masknr = PRVM_G_FLOAT( OFS_PARM0 );
+       if( masknr >= 0 && masknr <= HOSTCACHE_ANDMASKCOUNT )
+               mask = &hostcache_andmasks[masknr];
+       else if( masknr >= 512 && masknr - 512 <= HOSTCACHE_ORMASKCOUNT )
+               mask = &hostcache_ormasks[masknr - 512 ];
+       else {
+               Con_Printf( "VM_M_sethostcachemasknumber: invalid mask number %i\n", masknr );
+               return;
+       }
 
-//============================================================================
-// Client
+       number = PRVM_G_FLOAT( OFS_PARM2 );
+       field = (int) PRVM_G_FLOAT( OFS_PARM1 );
 
-char *vm_cl_extensions =
-"";
+       switch( field ) {
+               case HCIF_MAXPLAYERS:
+                       mask->info.maxplayers = number;
+                       break;
+               case HCIF_NUMPLAYERS:
+                       mask->info.numplayers = number;
+                       break;
+               case HCIF_PING:
+                       mask->info.ping = number;
+                       break;
+               case HCIF_PROTOCOL:
+                       mask->info.protocol = number;
+                       break;
+               default:
+                       Con_Printf( "VM_M_sethostcachemasknumber: Bad field number %i passed!\n", field );
+                       return;
+       }
 
-prvm_builtin_t vm_cl_builtins[] = {
-0  // to be consistent with the old vm
-};
+       mask->active = true;
+       mask->tests[field] = (int) PRVM_G_FLOAT( OFS_PARM3 );
+}
 
-const int vm_cl_numbuiltins = sizeof(vm_cl_builtins) / sizeof(prvm_builtin_t);
 
-void VM_CL_Cmd_Init(void)
+/*
+========================
+VM_M_resorthostcache
+
+resorthostcache
+========================
+*/
+void VM_M_resorthostcache( void )
 {
+       HostCache_RebuildViewSet();
 }
 
-void VM_CL_Cmd_Reset(void)
+/*
+=========
+VM_M_gethostcachestring
+
+string gethostcachestring(float field, float hostnr)
+=========
+*/
+void VM_M_gethostcachestring(void)
 {
-}
+       hostcache_t *cache;
+       int hostnr;
 
-//============================================================================
-// Menu
+       VM_SAFEPARMCOUNT(2, VM_M_gethostcachestring);
 
-char *vm_m_extensions =
-"";
+       PRVM_G_INT(OFS_RETURN) = 0;
+
+       hostnr = PRVM_G_FLOAT(OFS_PARM1);
+
+       if(hostnr < 0 || hostnr >= hostcache_viewcount)
+       {
+               Con_Print("VM_M_gethostcachestring: bad hostnr passed!\n");
+               return;
+       }
+       cache = hostcache_viewset[hostnr];
+       switch( (int) PRVM_G_FLOAT(OFS_PARM0) ) {
+               case HCIF_CNAME:
+                       PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( cache->info.cname );
+                       break;
+               case HCIF_NAME:
+                       PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( cache->info.name );
+                       break;
+               case HCIF_GAME:
+                       PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( cache->info.game );
+                       break;
+               case HCIF_MOD:
+                       PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( cache->info.mod );
+                       break;
+               case HCIF_MAP:
+                       PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( cache->info.map );
+                       break;
+               // TODO remove this again
+               case 1024:
+                       PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( cache->line1 );
+                       break;
+               case 1025:
+                       PRVM_G_INT( OFS_RETURN ) = PRVM_SetString( cache->line2 );
+                       break;
+               default:
+                       Con_Print("VM_M_gethostcachestring: bad field number passed!\n");
+       }
+}
 
 /*
 =========
-VM_M_setmousetarget
+VM_M_gethostcachenumber
 
-setmousetarget(float target)
+float  gethostcachenumber(float field, float hostnr)
 =========
 */
-void VM_M_setmousetarget(void)
+void VM_M_gethostcachenumber(void)
 {
-       VM_SAFEPARMCOUNT(1, VM_M_setmousetarget);
+       hostcache_t *cache;
+       int hostnr;
 
-       switch((int)PRVM_G_FLOAT(OFS_PARM0))
+       VM_SAFEPARMCOUNT(2, VM_M_gethostcachestring);
+
+       PRVM_G_INT(OFS_RETURN) = 0;
+
+       hostnr = PRVM_G_FLOAT(OFS_PARM1);
+
+       if(hostnr < 0 || hostnr >= hostcache_viewcount)
        {
-       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));
+               Con_Print("VM_M_gethostcachestring: bad hostnr passed!\n");
+               return;
+       }
+       cache = hostcache_viewset[hostnr];
+       switch( (int) PRVM_G_FLOAT(OFS_PARM0) ) {
+               case HCIF_MAXPLAYERS:
+                       PRVM_G_FLOAT( OFS_RETURN ) = cache->info.maxplayers;
+                       break;
+               case HCIF_NUMPLAYERS:
+                       PRVM_G_FLOAT( OFS_RETURN ) = cache->info.numplayers;
+                       break;
+               case HCIF_PING:
+                       PRVM_G_FLOAT( OFS_RETURN ) = cache->info.ping;
+                       break;
+               case HCIF_PROTOCOL:
+                       PRVM_G_FLOAT( OFS_RETURN ) = cache->info.protocol;
+                       break;
+               default:
+                       Con_Print("VM_M_gethostcachenumber: bad field number passed!\n");
        }
 }
 
 /*
-=========
-VM_M_getmousetarget
+========================
+VM_M_sethostcachesort
 
-float  getmousetarget
-=========
+sethostcachesort(float field, float descending)
+========================
 */
-void VM_M_getmousetarget(void)
+void VM_M_sethostcachesort( void )
 {
-       VM_SAFEPARMCOUNT(0,VM_M_getmousetarget);
+       VM_SAFEPARMCOUNT( 2, VM_M_sethostcachesort );
 
-       if(in_client_mouse)
-               PRVM_G_FLOAT(OFS_RETURN) = 2;
-       else
-               PRVM_G_FLOAT(OFS_RETURN) = 1;
+       hostcache_sortbyfield = (int) PRVM_G_FLOAT( OFS_PARM0 );
+       hostcache_sortdescending = (qboolean) PRVM_G_FLOAT( OFS_PARM1 );
 }
-       
 
+/*
+========================
+VM_M_refreshhostcache
+
+refreshhostcache()
+========================
+*/
+void VM_M_refreshhostcache( void )
+{
+       VM_SAFEPARMCOUNT( 0, VM_M_refreshhostcache );
+       HostCache_QueryList();
+}
 
 /*
-=========
-VM_M_setkeydest
+========================
+VM_M_gethostcacheindexforkey
 
-setkeydest(float dest)
-=========
+float gethostcacheindexforkey(string key)
+========================
 */
-void VM_M_setkeydest(void)
+void VM_M_gethostcacheindexforkey( void )
 {
-       VM_SAFEPARMCOUNT(1,VM_M_setkeydest);
+       char *key;
+       VM_SAFEPARMCOUNT( 1, VM_M_gethostcacheindexforkey );
 
-       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]);
-       }
+       key = PRVM_G_STRING( OFS_PARM0 );
+       VM_CheckEmptyString( key );
+       
+       if( !strcmp( key, "cname" ) )
+               PRVM_G_FLOAT( OFS_RETURN ) = HCIF_CNAME;
+       else if( !strcmp( key, "ping" ) )
+               PRVM_G_FLOAT( OFS_RETURN ) = HCIF_PING;
+       else if( !strcmp( key, "game" ) )
+               PRVM_G_FLOAT( OFS_RETURN ) = HCIF_GAME;
+       else if( !strcmp( key, "mod" ) )
+               PRVM_G_FLOAT( OFS_RETURN ) = HCIF_MOD;
+       else if( !strcmp( key, "map" ) )
+               PRVM_G_FLOAT( OFS_RETURN ) = HCIF_MAP;
+       else if( !strcmp( key, "name" ) )
+               PRVM_G_FLOAT( OFS_RETURN ) = HCIF_NAME;
+       else if( !strcmp( key, "maxplayers" ) )
+               PRVM_G_FLOAT( OFS_RETURN ) = HCIF_MAXPLAYERS;
+       else if( !strcmp( key, "numplayers" ) )
+               PRVM_G_FLOAT( OFS_RETURN ) = HCIF_NUMPLAYERS;
+       else if( !strcmp( key, "protocol" ) )
+               PRVM_G_FLOAT( OFS_RETURN ) = HCIF_PROTOCOL;
+       else
+               PRVM_G_FLOAT( OFS_RETURN ) = -1;
 }
 
 /*
-=========
-VM_M_getkeydest
+========================
+VM_M_addwantedhostcachekey
 
-float  getkeydest
-=========
+addwantedhostcachekey(string key)
+========================
 */
-void VM_M_getkeydest(void)
+void VM_M_addwantedhostcachekey( 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;
-       }
+       VM_SAFEPARMCOUNT( 1, VM_M_addwantedhostcachekey );
 }
 
 prvm_builtin_t vm_m_builtins[] = {
@@ -2560,13 +3929,27 @@ prvm_builtin_t vm_m_builtins[] = {
        VM_clcommand,
        VM_changelevel,
        VM_localsound,  
-       VM_getmousepos, // 66
-       0,
-       0,
-       0,
-       0,                              // 70
-       e10,                    // 80
-       e10,                    // 90
+       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,
+       VM_altstr_set,  // 85
+       0,0,0,0,0,      // 90
        e10,                    // 100
        e100,                   // 200
        e100,                   // 300
@@ -2593,11 +3976,16 @@ prvm_builtin_t vm_m_builtins[] = {
        VM_drawcharacter,
        VM_drawstring,
        VM_drawpic,
-       VM_drawfill,    // 457
-       0,
-       0,
-       0,                              // 460
-       e10,                    // 470
+       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
@@ -2606,7 +3994,26 @@ prvm_builtin_t vm_m_builtins[] = {
        VM_M_setkeydest,
        VM_M_getkeydest,
        VM_M_setmousetarget,
-       VM_M_getmousetarget
+       VM_M_getmousetarget,
+       VM_M_callfunction,
+       VM_M_writetofile,
+       VM_M_isfunction,
+       VM_M_getresolution,
+       VM_M_keynumtostring,
+       VM_M_findkeysforcommand,// 610
+       VM_M_gethostcachestat,
+       VM_M_gethostcachestring,
+       VM_M_parseentitydata,
+       VM_M_stringtokeynum,
+       VM_M_resethostcachemasks,
+       VM_M_sethostcachemaskstring,
+       VM_M_sethostcachemasknumber,
+       VM_M_resorthostcache,
+       VM_M_sethostcachesort,
+       VM_M_refreshhostcache,
+       VM_M_gethostcachenumber,
+       VM_M_gethostcacheindexforkey, 
+       VM_M_addwantedhostcachekey // 623
 };
 
 const int vm_m_numbuiltins = sizeof(vm_m_builtins) / sizeof(prvm_builtin_t);
@@ -2618,6 +4025,6 @@ void VM_M_Cmd_Init(void)
 
 void VM_M_Cmd_Reset(void)
 {
-       VM_Cmd_Init();
+       //VM_Cmd_Init();
+       VM_Cmd_Reset();
 }
-