]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - prvm_cmds.c
adding two new extensions: DP_QC_WHICHPACK (identify a pk3 containing a file), and...
[xonotic/darkplaces.git] / prvm_cmds.c
index 7f099c469e64a7866c4837440a2e4b72cdaf5ca1..7ab9143e184ece2b38e091a190862dc507cebac8 100644 (file)
@@ -9,19 +9,28 @@
 #include "prvm_cmds.h"
 #include <time.h>
 
+extern cvar_t prvm_backtraceforwarnings;
+
 // LordHavoc: changed this to NOT use a return statement, so that it can be used in functions that must return a value
 void VM_Warning(const char *fmt, ...)
 {
        va_list argptr;
        char msg[MAX_INPUTLINE];
+       static double recursive = -1;
 
        va_start(argptr,fmt);
        dpvsnprintf(msg,sizeof(msg),fmt,argptr);
        va_end(argptr);
 
-       Con_Print(msg);
+       Con_Printf(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]
-       //PRVM_PrintState();
+       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
+       {
+               recursive = realtime;
+               PRVM_PrintState();
+               recursive = -1;
+       }
 }
 
 
@@ -419,6 +428,49 @@ void VM_cvar (void)
        PRVM_G_FLOAT(OFS_RETURN) = Cvar_VariableValue(string);
 }
 
+/*
+=================
+VM_cvar
+
+float cvar_type (string)
+float CVAR_TYPEFLAG_EXISTS = 1;
+float CVAR_TYPEFLAG_SAVED = 2;
+float CVAR_TYPEFLAG_PRIVATE = 4;
+float CVAR_TYPEFLAG_ENGINE = 8;
+float CVAR_TYPEFLAG_HASDESCRIPTION = 16;
+=================
+*/
+void VM_cvar_type (void)
+{
+       char string[VM_STRINGTEMP_LENGTH];
+       cvar_t *cvar;
+       int ret;
+
+       VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar);
+       VM_VarString(0, string, sizeof(string));
+       VM_CheckEmptyString(string);
+       cvar = Cvar_FindVar(string);
+
+
+       if(!cvar)
+       {
+               PRVM_G_FLOAT(OFS_RETURN) = 0;
+               return; // CVAR_TYPE_NONE
+       }
+
+       ret = 1; // CVAR_EXISTS
+       if(cvar->flags & CVAR_SAVE)
+               ret |= 2; // CVAR_TYPE_SAVED
+       if(cvar->flags & CVAR_PRIVATE)
+               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
+               ret |= 16; // CVAR_TYPE_HASDESCRIPTION
+       
+       PRVM_G_FLOAT(OFS_RETURN) = ret;
+}
+
 /*
 =================
 VM_cvar_string
@@ -509,9 +561,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);
 }
 
@@ -547,7 +599,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);
 }
 
@@ -565,7 +617,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);
 }
 
@@ -616,6 +668,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
@@ -626,23 +691,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);
 }
 
 /*
@@ -1587,6 +1669,9 @@ void VM_fgets(void)
 
        VM_SAFEPARMCOUNT(1,VM_fgets);
 
+       // set the return value regardless of any possible errors
+       PRVM_G_INT(OFS_RETURN) = OFS_NULL;
+
        filenum = (int)PRVM_G_FLOAT(OFS_PARM0);
        if (filenum < 0 || filenum >= PRVM_MAX_OPENFILES)
        {
@@ -1619,8 +1704,6 @@ void VM_fgets(void)
                Con_Printf("fgets: %s: %s\n", PRVM_NAME, string);
        if (c >= 0 || end)
                PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(string);
-       else
-               PRVM_G_INT(OFS_RETURN) = OFS_NULL;
 }
 
 /*
@@ -1688,6 +1771,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)) ) ? 1.0f : 0.0f;
+}
+
 /*
 =========
 VM_strlen
@@ -2188,7 +2420,22 @@ void VM_clientstate(void)
 {
        VM_SAFEPARMCOUNT(0,VM_clientstate);
 
-       PRVM_G_FLOAT(OFS_RETURN) = cls.state;
+
+       switch( cls.state ) {
+               case ca_uninitialized:
+               case ca_dedicated:
+                       PRVM_G_FLOAT(OFS_RETURN) = 0;
+                       break;
+               case ca_disconnected:
+                       PRVM_G_FLOAT(OFS_RETURN) = 1;
+                       break;
+               case ca_connected:
+                       PRVM_G_FLOAT(OFS_RETURN) = 2;
+                       break;
+               default:
+                       // should never be reached!
+                       break;
+       }
 }
 
 /*
@@ -2217,23 +2464,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
@@ -2545,7 +2775,7 @@ void VM_precache_pic(void)
        VM_CheckEmptyString (s);
 
        // AK Draw_CachePic is supposed to always return a valid pointer
-       if( Draw_CachePic(s, false)->tex == r_texture_notexture )
+       if( Draw_CachePic_Flags(s, CACHEPICFLAG_NOTPERSISTENT)->tex == r_texture_notexture )
                PRVM_G_INT(OFS_RETURN) = OFS_NULL;
 }
 
@@ -2769,7 +2999,7 @@ void VM_drawpic(void)
        if(pos[2] || size[2])
                Con_Printf("VM_drawpic: z value%s from %s discarded\n",(pos[2] && size[2]) ? "s" : " ",((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size")));
 
-       DrawQ_Pic(pos[0], pos[1], Draw_CachePic(picname, true), size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag);
+       DrawQ_Pic(pos[0], pos[1], Draw_CachePic (picname), size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag);
        PRVM_G_FLOAT(OFS_RETURN) = 1;
 }
 /*
@@ -2817,7 +3047,7 @@ void VM_drawsubpic(void)
        if(pos[2] || size[2])
                Con_Printf("VM_drawsubpic: z value%s from %s discarded\n",(pos[2] && size[2]) ? "s" : " ",((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size")));
 
-       DrawQ_SuperPic(pos[0], pos[1], Draw_CachePic(picname, true),
+       DrawQ_SuperPic(pos[0], pos[1], Draw_CachePic (picname),
                size[0], size[1],
                srcPos[0],              srcPos[1],              rgb[0], rgb[1], rgb[2], alpha,
                srcPos[0] + srcSize[0], srcPos[1],              rgb[0], rgb[1], rgb[2], alpha,
@@ -2912,7 +3142,7 @@ void VM_getimagesize(void)
        p = PRVM_G_STRING(OFS_PARM0);
        VM_CheckEmptyString (p);
 
-       pic = Draw_CachePic (p, false);
+       pic = Draw_CachePic_Flags (p, CACHEPICFLAG_NOTPERSISTENT);
 
        PRVM_G_VECTOR(OFS_RETURN)[0] = pic->width;
        PRVM_G_VECTOR(OFS_RETURN)[1] = pic->height;
@@ -3064,7 +3294,6 @@ void VM_cin_restart( void )
                CL_RestartVideo( video );
 }
 
-#ifdef SUPPORT_GECKO
 /*
 ========================
 VM_Gecko_Init
@@ -3120,7 +3349,7 @@ void VM_gecko_create( void ) {
                        return;
        }
 
-       instance = prog->opengeckoinstances[ i ] = CL_Gecko_CreateBrowser( name );
+       instance = prog->opengeckoinstances[ i ] = CL_Gecko_CreateBrowser( name, PRVM_GetProgNr() );
    if( !instance ) {
                // TODO: error handling [12/3/2007 Black]
                PRVM_G_FLOAT( OFS_RETURN ) = 0;
@@ -3305,7 +3534,6 @@ void VM_gecko_get_texture_extent( void ) {
 }
 
 
-#endif
 
 /*
 ==============
@@ -3596,67 +3824,41 @@ void VM_altstr_ins(void)
 // BufString functions
 ////////////////////////////////////////
 //[515]: string buffers support
-#define MAX_QCSTR_BUFFERS 128
-#define MAX_QCSTR_STRINGS 1024
-
-typedef struct
-{
-       int             num_strings;
-       char    *strings[MAX_QCSTR_STRINGS];
-}qcstrbuffer_t;
-
-// FIXME: move stringbuffers to prog_t to allow multiple progs!
-static qcstrbuffer_t   *qcstringbuffers[MAX_QCSTR_BUFFERS];
-static int                             num_qcstringbuffers;
-static int                             buf_sortpower;
 
-#define BUFSTR_BUFFER(a) (a>=MAX_QCSTR_BUFFERS) ? NULL : (qcstringbuffers[a])
-#define BUFSTR_ISFREE(a) (a<MAX_QCSTR_BUFFERS&&qcstringbuffers[a]&&qcstringbuffers[a]->num_strings<=0) ? 1 : 0
+static size_t stringbuffers_sortlength;
 
-static int BufStr_FindFreeBuffer (void)
+static void BufStr_Expand(prvm_stringbuffer_t *stringbuffer, int strindex)
 {
-       int     i;
-       if(num_qcstringbuffers == MAX_QCSTR_BUFFERS)
-               return -1;
-       for(i=0;i<MAX_QCSTR_BUFFERS;i++)
-               if(!qcstringbuffers[i])
-               {
-                       qcstringbuffers[i] = (qcstrbuffer_t *)Z_Malloc(sizeof(qcstrbuffer_t));
-                       memset(qcstringbuffers[i], 0, sizeof(qcstrbuffer_t));
-                       return i;
-               }
-       return -1;
+       if (stringbuffer->max_strings <= strindex)
+       {
+               char **oldstrings = stringbuffer->strings;
+               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]));
+               if (stringbuffer->num_strings > 0)
+                       memcpy(stringbuffer->strings, oldstrings, stringbuffer->num_strings * sizeof(stringbuffer->strings[0]));
+               if (oldstrings)
+                       Mem_Free(oldstrings);
+       }
 }
 
-static void BufStr_ClearBuffer (int index)
+static void BufStr_Shrink(prvm_stringbuffer_t *stringbuffer)
 {
-       qcstrbuffer_t   *b = qcstringbuffers[index];
-       int                             i;
+       // reduce num_strings if there are empty string slots at the end
+       while (stringbuffer->num_strings > 0 && stringbuffer->strings[stringbuffer->num_strings - 1] == NULL)
+               stringbuffer->num_strings--;
 
-       if(b)
+       // if empty, free the string pointer array
+       if (stringbuffer->num_strings == 0)
        {
-               if(b->num_strings > 0)
-               {
-                       for(i=0;i<b->num_strings;i++)
-                               if(b->strings[i])
-                                       Z_Free(b->strings[i]);
-                       num_qcstringbuffers--;
-               }
-               Z_Free(qcstringbuffers[index]);
-               qcstringbuffers[index] = NULL;
+               stringbuffer->max_strings = 0;
+               if (stringbuffer->strings)
+                       Mem_Free(stringbuffer->strings);
+               stringbuffer->strings = NULL;
        }
 }
 
-static int BufStr_FindFreeString (qcstrbuffer_t *b)
-{
-       int                             i;
-       for(i=0;i<b->num_strings;i++)
-               if(!b->strings[i] || !b->strings[i][0])
-                       return i;
-       if(i == MAX_QCSTR_STRINGS)      return -1;
-       else                                            return i;
-}
-
 static int BufStr_SortStringsUP (const void *in1, const void *in2)
 {
        const char *a, *b;
@@ -3664,7 +3866,7 @@ static int BufStr_SortStringsUP (const void *in1, const void *in2)
        b = *((const char **) in2);
        if(!a[0])       return 1;
        if(!b[0])       return -1;
-       return strncmp(a, b, buf_sortpower);
+       return strncmp(a, b, stringbuffers_sortlength);
 }
 
 static int BufStr_SortStringsDOWN (const void *in1, const void *in2)
@@ -3674,7 +3876,7 @@ static int BufStr_SortStringsDOWN (const void *in1, const void *in2)
        b = *((const char **) in2);
        if(!a[0])       return 1;
        if(!b[0])       return -1;
-       return strncmp(b, a, buf_sortpower);
+       return strncmp(b, a, stringbuffers_sortlength);
 }
 
 /*
@@ -3686,13 +3888,11 @@ float buf_create(void) = #460;
 */
 void VM_buf_create (void)
 {
+       prvm_stringbuffer_t *stringbuffer;
        int i;
        VM_SAFEPARMCOUNT(0, VM_buf_create);
-       i = BufStr_FindFreeBuffer();
-       if(i >= 0)
-               num_qcstringbuffers++;
-       //else
-               //Con_Printf("VM_buf_create: buffers overflow in %s\n", PRVM_NAME);
+       stringbuffer = Mem_ExpandableArray_AllocRecord(&prog->stringbuffersarray);
+       for (i = 0;stringbuffer != Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, i);i++);
        PRVM_G_FLOAT(OFS_RETURN) = i;
 }
 
@@ -3705,9 +3905,19 @@ void buf_del(float bufhandle) = #461;
 */
 void VM_buf_del (void)
 {
+       prvm_stringbuffer_t *stringbuffer;
        VM_SAFEPARMCOUNT(1, VM_buf_del);
-       if(BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0)))
-               BufStr_ClearBuffer((int)PRVM_G_FLOAT(OFS_PARM0));
+       stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
+       if (stringbuffer)
+       {
+               int i;
+               for (i = 0;i < stringbuffer->num_strings;i++)
+                       if (stringbuffer->strings[i])
+                               Mem_Free(stringbuffer->strings[i]);
+               if (stringbuffer->strings)
+                       Mem_Free(stringbuffer->strings);
+               Mem_ExpandableArray_FreeRecord(&prog->stringbuffersarray, stringbuffer);
+       }
        else
        {
                VM_Warning("VM_buf_del: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
@@ -3724,18 +3934,18 @@ float buf_getsize(float bufhandle) = #462;
 */
 void VM_buf_getsize (void)
 {
-       qcstrbuffer_t   *b;
+       prvm_stringbuffer_t *stringbuffer;
        VM_SAFEPARMCOUNT(1, VM_buf_getsize);
 
-       b = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0));
-       if(!b)
+       stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
+       if(!stringbuffer)
        {
                PRVM_G_FLOAT(OFS_RETURN) = -1;
                VM_Warning("VM_buf_getsize: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
                return;
        }
        else
-               PRVM_G_FLOAT(OFS_RETURN) = b->num_strings;
+               PRVM_G_FLOAT(OFS_RETURN) = stringbuffer->num_strings;
 }
 
 /*
@@ -3747,12 +3957,12 @@ void buf_copy(float bufhandle_from, float bufhandle_to) = #463;
 */
 void VM_buf_copy (void)
 {
-       qcstrbuffer_t   *b1, *b2;
-       int                             i;
+       prvm_stringbuffer_t *srcstringbuffer, *dststringbuffer;
+       int i;
        VM_SAFEPARMCOUNT(2, VM_buf_copy);
 
-       b1 = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0));
-       if(!b1)
+       srcstringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
+       if(!srcstringbuffer)
        {
                VM_Warning("VM_buf_copy: invalid source buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
                return;
@@ -3763,31 +3973,32 @@ void VM_buf_copy (void)
                VM_Warning("VM_buf_copy: source == destination (%i) in %s\n", i, PRVM_NAME);
                return;
        }
-       b2 = BUFSTR_BUFFER(i);
-       if(!b2)
+       dststringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
+       if(!dststringbuffer)
        {
                VM_Warning("VM_buf_copy: invalid destination buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM1), PRVM_NAME);
                return;
        }
 
-       BufStr_ClearBuffer(i);
-       qcstringbuffers[i] = (qcstrbuffer_t *)Z_Malloc(sizeof(qcstrbuffer_t));
-       memset(qcstringbuffers[i], 0, sizeof(qcstrbuffer_t));
-       b2->num_strings = b1->num_strings;
+       for (i = 0;i < dststringbuffer->num_strings;i++)
+               if (dststringbuffer->strings[i])
+                       Mem_Free(dststringbuffer->strings[i]);
+       if (dststringbuffer->strings)
+               Mem_Free(dststringbuffer->strings);
+       *dststringbuffer = *srcstringbuffer;
+       if (dststringbuffer->max_strings)
+               dststringbuffer->strings = (char **)Mem_Alloc(prog->progs_mempool, sizeof(dststringbuffer->strings[0]) * dststringbuffer->max_strings);
 
-       for(i=0;i<b1->num_strings;i++)
-               if(b1->strings[i] && b1->strings[i][0])
+       for (i = 0;i < dststringbuffer->num_strings;i++)
+       {
+               if (srcstringbuffer->strings[i])
                {
                        size_t stringlen;
-                       stringlen = strlen(b1->strings[i]) + 1;
-                       b2->strings[i] = (char *)Z_Malloc(stringlen);
-                       if(!b2->strings[i])
-                       {
-                               VM_Warning("VM_buf_copy: not enough memory for buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM1), PRVM_NAME);
-                               break;
-                       }
-                       memcpy(b2->strings[i], b1->strings[i], stringlen);
+                       stringlen = strlen(srcstringbuffer->strings[i]) + 1;
+                       dststringbuffer->strings[i] = (char *)Mem_Alloc(prog->progs_mempool, stringlen);
+                       memcpy(dststringbuffer->strings[i], srcstringbuffer->strings[i], stringlen);
                }
+       }
 }
 
 /*
@@ -3800,45 +4011,30 @@ void buf_sort(float bufhandle, float cmplength, float backward) = #464;
 */
 void VM_buf_sort (void)
 {
-       qcstrbuffer_t   *b;
-       int                             i;
+       prvm_stringbuffer_t *stringbuffer;
        VM_SAFEPARMCOUNT(3, VM_buf_sort);
 
-       b = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0));
-       if(!b)
+       stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
+       if(!stringbuffer)
        {
                VM_Warning("VM_buf_sort: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
                return;
        }
-       if(b->num_strings <= 0)
+       if(stringbuffer->num_strings <= 0)
        {
                VM_Warning("VM_buf_sort: tried to sort empty buffer %i in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
                return;
        }
-       // TODO: please someone rename this to buf_cmplength [12/3/2007 Black]
-       buf_sortpower = (int)PRVM_G_FLOAT(OFS_PARM1);
-       if(buf_sortpower <= 0)
-               buf_sortpower = 99999999;
+       stringbuffers_sortlength = (int)PRVM_G_FLOAT(OFS_PARM1);
+       if(stringbuffers_sortlength <= 0)
+               stringbuffers_sortlength = 0x7FFFFFFF;
 
        if(!PRVM_G_FLOAT(OFS_PARM2))
-               qsort(b->strings, b->num_strings, sizeof(char*), BufStr_SortStringsUP);
+               qsort(stringbuffer->strings, stringbuffer->num_strings, sizeof(char*), BufStr_SortStringsUP);
        else
-               qsort(b->strings, b->num_strings, sizeof(char*), BufStr_SortStringsDOWN);
+               qsort(stringbuffer->strings, stringbuffer->num_strings, sizeof(char*), BufStr_SortStringsDOWN);
 
-       for(i=b->num_strings-1;i>=0;i--)        //[515]: delete empty lines
-               if(b->strings)
-               {
-                       if(b->strings[i][0])
-                               break;
-                       else
-                       {
-                               Z_Free(b->strings[i]);
-                               --b->num_strings;
-                               b->strings[i] = NULL;
-                       }
-               }
-               else
-                       --b->num_strings;
+       BufStr_Shrink(stringbuffer);
 }
 
 /*
@@ -3850,33 +4046,35 @@ string buf_implode(float bufhandle, string glue) = #465;
 */
 void VM_buf_implode (void)
 {
-       qcstrbuffer_t   *b;
+       prvm_stringbuffer_t *stringbuffer;
        char                    k[VM_STRINGTEMP_LENGTH];
        const char              *sep;
        int                             i;
        size_t                  l;
        VM_SAFEPARMCOUNT(2, VM_buf_implode);
 
-       b = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0));
+       stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
        PRVM_G_INT(OFS_RETURN) = OFS_NULL;
-       if(!b)
+       if(!stringbuffer)
        {
                VM_Warning("VM_buf_implode: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
                return;
        }
-       if(!b->num_strings)
+       if(!stringbuffer->num_strings)
                return;
        sep = PRVM_G_STRING(OFS_PARM1);
        k[0] = 0;
-       for(l=i=0;i<b->num_strings;i++)
-               if(b->strings[i])
+       for(l = i = 0;i < stringbuffer->num_strings;i++)
+       {
+               if(stringbuffer->strings[i])
                {
-                       l += (i > 0 ? strlen(sep) : 0) + strlen(b->strings[i]);
+                       l += (i > 0 ? strlen(sep) : 0) + strlen(stringbuffer->strings[i]);
                        if (l >= sizeof(k) - 1)
                                break;
                        strlcat(k, sep, sizeof(k));
-                       strlcat(k, b->strings[i], sizeof(k));
+                       strlcat(k, stringbuffer->strings[i], sizeof(k));
                }
+       }
        PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(k);
 }
 
@@ -3889,27 +4087,25 @@ string bufstr_get(float bufhandle, float string_index) = #465;
 */
 void VM_bufstr_get (void)
 {
-       qcstrbuffer_t   *b;
+       prvm_stringbuffer_t *stringbuffer;
        int                             strindex;
        VM_SAFEPARMCOUNT(2, VM_bufstr_get);
 
        PRVM_G_INT(OFS_RETURN) = OFS_NULL;
-       b = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0));
-       if(!b)
+       stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
+       if(!stringbuffer)
        {
                VM_Warning("VM_bufstr_get: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
                return;
        }
        strindex = (int)PRVM_G_FLOAT(OFS_PARM1);
-       if(strindex < 0 || strindex > MAX_QCSTR_STRINGS)
+       if (strindex < 0)
        {
                VM_Warning("VM_bufstr_get: invalid string index %i used in %s\n", strindex, PRVM_NAME);
                return;
        }
-       if(b->num_strings <= strindex)
-               return;
-       if(b->strings[strindex])
-               PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(b->strings[strindex]);
+       if (strindex < stringbuffer->num_strings && stringbuffer->strings[strindex])
+               PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(stringbuffer->strings[strindex]);
 }
 
 /*
@@ -3921,88 +4117,88 @@ void bufstr_set(float bufhandle, float string_index, string str) = #466;
 */
 void VM_bufstr_set (void)
 {
-       int                             bufindex, strindex;
-       qcstrbuffer_t   *b;
+       int                             strindex;
+       prvm_stringbuffer_t *stringbuffer;
        const char              *news;
-       size_t                  alloclen;
 
        VM_SAFEPARMCOUNT(3, VM_bufstr_set);
 
-       bufindex = (int)PRVM_G_FLOAT(OFS_PARM0);
-       b = BUFSTR_BUFFER(bufindex);
-       if(!b)
+       stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
+       if(!stringbuffer)
        {
-               VM_Warning("VM_bufstr_set: invalid buffer %i used in %s\n", bufindex, PRVM_NAME);
+               VM_Warning("VM_bufstr_set: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
                return;
        }
        strindex = (int)PRVM_G_FLOAT(OFS_PARM1);
-       if(strindex < 0 || strindex > MAX_QCSTR_STRINGS)
+       if(strindex < 0 || strindex >= 1000000) // huge number of strings
        {
                VM_Warning("VM_bufstr_set: invalid string index %i used in %s\n", strindex, PRVM_NAME);
                return;
        }
+
+       BufStr_Expand(stringbuffer, strindex);
+       stringbuffer->num_strings = max(stringbuffer->num_strings, strindex + 1);
+
+       if(stringbuffer->strings[strindex])
+               Mem_Free(stringbuffer->strings[strindex]);
+       stringbuffer->strings[strindex] = NULL;
+
        news = PRVM_G_STRING(OFS_PARM2);
-       if(b->strings[strindex])
-               Z_Free(b->strings[strindex]);
-       alloclen = strlen(news) + 1;
-       b->strings[strindex] = (char *)Z_Malloc(alloclen);
-       memcpy(b->strings[strindex], news, alloclen);
+       if (news && news[0])
+       {
+               size_t alloclen = strlen(news) + 1;
+               stringbuffer->strings[strindex] = (char *)Mem_Alloc(prog->progs_mempool, alloclen);
+               memcpy(stringbuffer->strings[strindex], news, alloclen);
+       }
+
+       BufStr_Shrink(stringbuffer);
 }
 
 /*
 ========================
 VM_bufstr_add
-adds string to buffer in nearest free slot and returns it
+adds string to buffer in first free slot and returns its index
 "order == TRUE" means that string will be added after last "full" slot
 float bufstr_add(float bufhandle, string str, float order) = #467;
 ========================
 */
 void VM_bufstr_add (void)
 {
-       int                             bufindex, order, strindex;
-       qcstrbuffer_t   *b;
+       int                             order, strindex;
+       prvm_stringbuffer_t *stringbuffer;
        const char              *string;
        size_t                  alloclen;
 
        VM_SAFEPARMCOUNT(3, VM_bufstr_add);
 
-       bufindex = (int)PRVM_G_FLOAT(OFS_PARM0);
-       b = BUFSTR_BUFFER(bufindex);
+       stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
        PRVM_G_FLOAT(OFS_RETURN) = -1;
-       if(!b)
+       if(!stringbuffer)
        {
-               VM_Warning("VM_bufstr_add: invalid buffer %i used in %s\n", bufindex, PRVM_NAME);
+               VM_Warning("VM_bufstr_add: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
                return;
        }
        string = PRVM_G_STRING(OFS_PARM1);
+       if(!string || !string[0])
+       {
+               VM_Warning("VM_bufstr_add: can not add an empty string to buffer %i in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME);
+               return;
+       }
        order = (int)PRVM_G_FLOAT(OFS_PARM2);
        if(order)
-               strindex = b->num_strings;
+               strindex = stringbuffer->num_strings;
        else
-       {
-               strindex = BufStr_FindFreeString(b);
-               if(strindex < 0)
-               {
-                       VM_Warning("VM_bufstr_add: buffer %i has no free string slots in %s\n", bufindex, PRVM_NAME);
-                       return;
-               }
-       }
+               for (strindex = 0;strindex < stringbuffer->num_strings;strindex++)
+                       if (stringbuffer->strings[strindex] == NULL)
+                               break;
 
-       while(b->num_strings <= strindex)
-       {
-               if(b->num_strings == MAX_QCSTR_STRINGS)
-               {
-                       VM_Warning("VM_bufstr_add: buffer %i has no free string slots in %s\n", bufindex, PRVM_NAME);
-                       return;
-               }
-               b->strings[b->num_strings] = NULL;
-               b->num_strings++;
-       }
-       if(b->strings[strindex])
-               Z_Free(b->strings[strindex]);
+       BufStr_Expand(stringbuffer, strindex);
+
+       stringbuffer->num_strings = max(stringbuffer->num_strings, strindex + 1);
        alloclen = strlen(string) + 1;
-       b->strings[strindex] = (char *)Z_Malloc(alloclen);
-       memcpy(b->strings[strindex], string, alloclen);
+       stringbuffer->strings[strindex] = (char *)Mem_Alloc(prog->progs_mempool, alloclen);
+       memcpy(stringbuffer->strings[strindex], string, alloclen);
+
        PRVM_G_FLOAT(OFS_RETURN) = strindex;
 }
 
@@ -4016,26 +4212,30 @@ void bufstr_free(float bufhandle, float string_index) = #468;
 void VM_bufstr_free (void)
 {
        int                             i;
-       qcstrbuffer_t   *b;
+       prvm_stringbuffer_t     *stringbuffer;
        VM_SAFEPARMCOUNT(2, VM_bufstr_free);
 
-       b = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0));
-       if(!b)
+       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;
        }
        i = (int)PRVM_G_FLOAT(OFS_PARM1);
-       if(i < 0 || i > MAX_QCSTR_STRINGS)
+       if(i < 0)
        {
                VM_Warning("VM_bufstr_free: invalid string index %i used in %s\n", i, PRVM_NAME);
                return;
        }
-       if(b->strings[i])
-               Z_Free(b->strings[i]);
-       b->strings[i] = NULL;
-       if(i+1 == b->num_strings)
-               --b->num_strings;
+
+       if (i < stringbuffer->num_strings)
+       {
+               if(stringbuffer->strings[i])
+                       Mem_Free(stringbuffer->strings[i]);
+               stringbuffer->strings[i] = NULL;
+       }
+
+       BufStr_Shrink(stringbuffer);
 }
 
 //=============
@@ -4474,6 +4674,17 @@ void VM_strncasecmp (void)
        }
 }
 
+// #494 float(float caseinsensitive, string s, ...) crc16
+void VM_crc16(void)
+{
+       float insensitive;
+       static char s[VM_STRINGTEMP_LENGTH];
+       VM_SAFEPARMCOUNTRANGE(2, 8, VM_hash);
+       insensitive = PRVM_G_FLOAT(OFS_PARM0);
+       VM_VarString(1, s, sizeof(s));
+       PRVM_G_FLOAT(OFS_RETURN) = (unsigned short) ((insensitive ? CRC_Block_CaseInsensitive : CRC_Block) ((unsigned char *) s, strlen(s)));
+}
+
 void VM_wasfreed (void)
 {
        VM_SAFEPARMCOUNT(1, VM_wasfreed);
@@ -4518,9 +4729,7 @@ void VM_Cmd_Init(void)
        // only init the stuff for the current prog
        VM_Files_Init();
        VM_Search_Init();
-#ifdef SUPPORT_GECKO
        VM_Gecko_Init();
-#endif
 //     VM_BufStr_Init();
 }
 
@@ -4529,9 +4738,99 @@ void VM_Cmd_Reset(void)
        CL_PurgeOwner( MENUOWNER );
        VM_Search_Reset();
        VM_Files_CloseAll();
-#ifdef SUPPORT_GECKO
        VM_Gecko_Destroy();
-#endif
 //     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;
+
+       fn = PRVM_G_STRING(OFS_PARM0);
+       pack = FS_WhichPack(fn);
+
+       PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(pack ? pack : "");
+}
+