]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - prvm_cmds.c
DP_QC_URI_ESCAPE
[xonotic/darkplaces.git] / prvm_cmds.c
index a3505fe8e63ff0637002be738f198e969139eb01..401c7f93e445b73c6fc19d02b9e5fb08b88116f8 100644 (file)
@@ -428,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
@@ -1596,6 +1639,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)
        {
@@ -1628,8 +1674,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;
 }
 
 /*
@@ -2197,7 +2241,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;
+       }
 }
 
 /*
@@ -2554,7 +2613,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;
 }
 
@@ -2778,7 +2837,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;
 }
 /*
@@ -2826,7 +2885,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,
@@ -2921,7 +2980,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;
@@ -3128,7 +3187,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;
@@ -3916,6 +3975,7 @@ void VM_bufstr_set (void)
        }
 
        BufStr_Expand(stringbuffer, strindex);
+       stringbuffer->num_strings = max(stringbuffer->num_strings, strindex + 1);
 
        if(stringbuffer->strings[strindex])
                Mem_Free(stringbuffer->strings[strindex]);
@@ -3964,7 +4024,7 @@ void VM_bufstr_add (void)
        }
        order = (int)PRVM_G_FLOAT(OFS_PARM2);
        if(order)
-               strindex = stringbuffer->num_strings++;
+               strindex = stringbuffer->num_strings;
        else
                for (strindex = 0;strindex < stringbuffer->num_strings;strindex++)
                        if (stringbuffer->strings[strindex] == NULL)
@@ -4452,6 +4512,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);
@@ -4509,3 +4580,83 @@ void VM_Cmd_Reset(void)
 //     VM_BufStr_ShutDown();
 }
 
+// #510 string(string input, ...) uri_escape (DP_QC_URI_ESCAPE)
+// does URI escaping on a string (replace evil stuff by %AB escapes)
+void VM_uri_escape (void)
+{
+       char src[VM_STRINGTEMP_LENGTH];
+       char dest[VM_STRINGTEMP_LENGTH];
+       char *p, *q;
+       static const char *hex = "0123456789abcdef";
+
+       VM_SAFEPARMCOUNTRANGE(1, 8, VM_uri_escape);
+       VM_VarString(0, src, sizeof(src));
+
+       for(p = src, q = dest; *p && q < dest + sizeof(dest) - 3; ++p)
+       {
+               if((*p >= 'A' && *p <= 'Z')
+                       || (*p >= 'a' && *p <= 'z')
+                       || (*p >= '0' && *p <= '9')
+                       || (*p == '-')  || (*p == '_') || (*p == '.')
+                       || (*p == '!')  || (*p == '~') || (*p == '*')
+                       || (*p == '\'') || (*p == '(') || (*p == ')'))
+                       *q++ = *p;
+               else
+               {
+                       *q++ = '%';
+                       *q++ = hex[(*(unsigned char *)p >> 4) & 0xF];
+                       *q++ = hex[ *(unsigned char *)p       & 0xF];
+               }
+       }
+       *q++ = 0;
+
+       PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(dest);
+}
+
+// #510 string(string input, ...) uri_unescape (DP_QC_URI_ESCAPE)
+// does URI unescaping on a string (get back the evil stuff)
+void VM_uri_unescape (void)
+{
+       char src[VM_STRINGTEMP_LENGTH];
+       char dest[VM_STRINGTEMP_LENGTH];
+       char *p, *q;
+       int hi, lo;
+
+       VM_SAFEPARMCOUNTRANGE(1, 8, VM_uri_unescape);
+       VM_VarString(0, src, sizeof(src));
+
+       for(p = src, q = dest; *p; ) // no need to check size, because unescape can't expand
+       {
+               if(*p == '%')
+               {
+                       if(p[1] >= '0' && p[1] <= '9')
+                               hi = p[1] - '0';
+                       else if(p[1] >= 'a' && p[1] <= 'f')
+                               hi = p[1] - 'a' + 10;
+                       else if(p[1] >= 'A' && p[1] <= 'F')
+                               hi = p[1] - 'A' + 10;
+                       else
+                               goto nohex;
+                       if(p[2] >= '0' && p[2] <= '9')
+                               lo = p[2] - '0';
+                       else if(p[2] >= 'a' && p[2] <= 'f')
+                               lo = p[2] - 'a' + 10;
+                       else if(p[2] >= 'A' && p[2] <= 'F')
+                               lo = p[2] - 'A' + 10;
+                       else
+                               goto nohex;
+                       if(hi != 0 || lo != 0) // don't unescape NUL bytes
+                               *q++ = (char) (hi * 0x10 + lo);
+                       p += 3;
+                       continue;
+               }
+
+nohex:
+               // otherwise:
+               *q++ = *p++;
+       }
+       *q++ = 0;
+
+       PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(dest);
+}
+