replaced sv_clmovement_waitforinput with sv_clmovement_inputtimeout

[xonotic/darkplaces.git] / prvm_cmds.c

diff --git a/prvm_cmds.c b/prvm_cmds.c
index 51559a910c2f5cd15247ba3ec4437948c4ed2089..a644f1a2e3ef76e4571abfeb6c5e9079cef8d3bc 100644 (file)
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -413,6 +413,13 @@ void VM_localcmd (void)
        Cbuf_AddText(string);
 }
 
+static qboolean PRVM_Cvar_ReadOk(const char *string)
+{
+       cvar_t *cvar;
+       cvar = Cvar_FindVar(string);
+       return ((cvar) && ((cvar->flags & CVAR_PRIVATE) == 0));
+}
+
 /*
 =================
 VM_cvar
@@ -426,7 +433,7 @@ void VM_cvar (void)
        VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar);
        VM_VarString(0, string, sizeof(string));
        VM_CheckEmptyString(string);
-       PRVM_G_FLOAT(OFS_RETURN) = Cvar_VariableValue(string);
+       PRVM_G_FLOAT(OFS_RETURN) = PRVM_Cvar_ReadOk(string) ? Cvar_VariableValue(string) : 0;
 }
 
 /*
@@ -488,7 +495,7 @@ void VM_cvar_string(void)
        VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar_string);
        VM_VarString(0, string, sizeof(string));
        VM_CheckEmptyString(string);
-       PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(Cvar_VariableString(string));
+       PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(PRVM_Cvar_ReadOk(string) ? Cvar_VariableString(string) : "");
 }
 
 
@@ -891,11 +898,16 @@ void VM_findchain (void)
        int             f;
        const char      *s, *t;
        prvm_edict_t    *ent, *chain;
+       int chainfield;
 
-       VM_SAFEPARMCOUNT(2,VM_findchain);
+       VM_SAFEPARMCOUNTRANGE(2,3,VM_findchain);
 
-       if (prog->fieldoffsets.chain < 0)
-               PRVM_ERROR("VM_findchain: %s doesnt have a chain field !", PRVM_NAME);
+       if(prog->argc == 3)
+               chainfield = PRVM_G_INT(OFS_PARM2);
+       else
+               chainfield = prog->fieldoffsets.chain;
+       if (chainfield < 0)
+               PRVM_ERROR("VM_findchain: %s doesnt have the specified chain field !", PRVM_NAME);
 
        chain = prog->edicts;
 
@@ -918,7 +930,7 @@ void VM_findchain (void)
                if (strcmp(t,s))
                        continue;
 
-               PRVM_EDICTFIELDVALUE(ent,prog->fieldoffsets.chain)->edict = PRVM_NUM_FOR_EDICT(chain);
+               PRVM_EDICTFIELDVALUE(ent,chainfield)->edict = PRVM_NUM_FOR_EDICT(chain);
                chain = ent;
        }
 
@@ -941,11 +953,16 @@ void VM_findchainfloat (void)
        int             f;
        float   s;
        prvm_edict_t    *ent, *chain;
+       int chainfield;
 
-       VM_SAFEPARMCOUNT(2, VM_findchainfloat);
+       VM_SAFEPARMCOUNTRANGE(2, 3, VM_findchainfloat);
 
-       if (prog->fieldoffsets.chain < 0)
-               PRVM_ERROR("VM_findchainfloat: %s doesnt have a chain field !", PRVM_NAME);
+       if(prog->argc == 3)
+               chainfield = PRVM_G_INT(OFS_PARM2);
+       else
+               chainfield = prog->fieldoffsets.chain;
+       if (chainfield < 0)
+               PRVM_ERROR("VM_findchain: %s doesnt have the specified chain field !", PRVM_NAME);
 
        chain = (prvm_edict_t *)prog->edicts;
 
@@ -961,7 +978,7 @@ void VM_findchainfloat (void)
                if (PRVM_E_FLOAT(ent,f) != s)
                        continue;
 
-               PRVM_EDICTFIELDVALUE(ent,prog->fieldoffsets.chain)->edict = PRVM_EDICT_TO_PROG(chain);
+               PRVM_EDICTFIELDVALUE(ent,chainfield)->edict = PRVM_EDICT_TO_PROG(chain);
                chain = ent;
        }
 
@@ -1022,11 +1039,16 @@ void VM_findchainflags (void)
        int             f;
        int             s;
        prvm_edict_t    *ent, *chain;
+       int chainfield;
 
-       VM_SAFEPARMCOUNT(2, VM_findchainflags);
+       VM_SAFEPARMCOUNTRANGE(2, 3, VM_findchainflags);
 
-       if (prog->fieldoffsets.chain < 0)
-               PRVM_ERROR("VM_findchainflags: %s doesnt have a chain field !", PRVM_NAME);
+       if(prog->argc == 3)
+               chainfield = PRVM_G_INT(OFS_PARM2);
+       else
+               chainfield = prog->fieldoffsets.chain;
+       if (chainfield < 0)
+               PRVM_ERROR("VM_findchain: %s doesnt have the specified chain field !", PRVM_NAME);
 
        chain = (prvm_edict_t *)prog->edicts;
 
@@ -1044,7 +1066,7 @@ void VM_findchainflags (void)
                if (!((int)PRVM_E_FLOAT(ent,f) & s))
                        continue;
 
-               PRVM_EDICTFIELDVALUE(ent,prog->fieldoffsets.chain)->edict = PRVM_EDICT_TO_PROG(chain);
+               PRVM_EDICTFIELDVALUE(ent,chainfield)->edict = PRVM_EDICT_TO_PROG(chain);
                chain = ent;
        }
 
@@ -1941,7 +1963,7 @@ void VM_putentityfieldstring(void)
        }
 
        // 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;
+       PRVM_G_FLOAT(OFS_RETURN) = ( PRVM_ED_ParseEpair(ent, d, PRVM_G_STRING(OFS_PARM2), false) ) ? 1.0f : 0.0f;
 }
 
 /*
@@ -2290,9 +2312,9 @@ float tokenize(string s)
 //this function originally written by KrimZon, made shorter by LordHavoc
 //20040203: rewritten by LordHavoc (no longer uses allocations)
 static int num_tokens = 0;
-static int tokens[256];
-static int tokens_startpos[256];
-static int tokens_endpos[256];
+static int tokens[VM_STRINGTEMP_LENGTH / 2];
+static int tokens_startpos[VM_STRINGTEMP_LENGTH / 2];
+static int tokens_endpos[VM_STRINGTEMP_LENGTH / 2];
 static char tokenize_string[VM_STRINGTEMP_LENGTH];
 void VM_tokenize (void)
 {
@@ -2375,7 +2397,7 @@ void VM_tokenizebyseparator (void)
        int numseparators;
        int separatorlen[7];
        const char *separators[7];
-       const char *p;
+       const char *p, *p0;
        const char *token;
        char tokentext[MAX_INPUTLINE];
 
@@ -2403,6 +2425,7 @@ void VM_tokenizebyseparator (void)
        {
                token = tokentext + j;
                tokens_startpos[num_tokens] = p - tokenize_string;
+               p0 = p;
                while (*p)
                {
                        for (k = 0;k < numseparators;k++)
@@ -2418,8 +2441,9 @@ void VM_tokenizebyseparator (void)
                        if (j < (int)sizeof(tokentext)-1)
                                tokentext[j++] = *p;
                        p++;
+                       p0 = p;
                }
-               tokens_endpos[num_tokens] = p - tokenize_string;
+               tokens_endpos[num_tokens] = p0 - tokenize_string;
                if (j >= (int)sizeof(tokentext))
                        break;
                tokentext[j++] = 0;
@@ -2576,11 +2600,40 @@ VM_gettime
 float  gettime(void)
 =========
 */
+extern double host_starttime;
 void VM_gettime(void)
 {
-       VM_SAFEPARMCOUNT(0,VM_gettime);
+       int timer_index;
 
-       PRVM_G_FLOAT(OFS_RETURN) = (float) realtime;
+       VM_SAFEPARMCOUNTRANGE(0,1,VM_gettime);
+
+       if(prog->argc == 0)
+       {
+               PRVM_G_FLOAT(OFS_RETURN) = (float) realtime;
+       }
+       else
+       {
+               timer_index = (int) PRVM_G_FLOAT(OFS_PARM0);
+        switch(timer_index)
+        {
+            case 0: // GETTIME_FRAMESTART
+                PRVM_G_FLOAT(OFS_RETURN) = (float) realtime;
+                break;
+            case 1: // GETTIME_REALTIME
+                PRVM_G_FLOAT(OFS_RETURN) = (float) Sys_DoubleTime();
+                break;
+            case 2: // GETTIME_HIRES
+                PRVM_G_FLOAT(OFS_RETURN) = (float) (Sys_DoubleTime() - realtime);
+                break;
+            case 3: // GETTIME_UPTIME
+                PRVM_G_FLOAT(OFS_RETURN) = (float) Sys_DoubleTime() - host_starttime;
+                break;
+                       default:
+                               VM_Warning("VM_gettime: %s: unsupported timer specified, returning realtime\n", PRVM_NAME);
+                               PRVM_G_FLOAT(OFS_RETURN) = (float) realtime;
+                               break;
+               }
+       }
 }
 
 /*
@@ -2912,7 +2965,7 @@ dp_font_t *getdrawfont()
 {
        if(prog->globaloffsets.drawfont >= 0)
        {
-               int f = PRVM_G_FLOAT(prog->globaloffsets.drawfont);
+               int f = (int) PRVM_G_FLOAT(prog->globaloffsets.drawfont);
                if(f < 0 || f >= MAX_FONTS)
                        return FONT_DEFAULT;
                return &dp_fonts[f];
@@ -3593,7 +3646,7 @@ void VM_gecko_keyevent( void ) {
                return;
        }
 
-       PRVM_G_FLOAT( OFS_RETURN ) = (CL_Gecko_Event_Key( instance, key, eventtype ) == true);
+       PRVM_G_FLOAT( OFS_RETURN ) = (CL_Gecko_Event_Key( instance, (keynum_t) key, eventtype ) == true);
 }
 
 /*
@@ -3646,7 +3699,7 @@ void VM_gecko_resize( void ) {
        if( !instance ) {
                return;
        }
-       CL_Gecko_Resize( instance, w, h );
+       CL_Gecko_Resize( instance, (int) w, (int) h );
 }
 
 
@@ -3979,7 +4032,7 @@ static void BufStr_Expand(prvm_stringbuffer_t *stringbuffer, int strindex)
                stringbuffer->max_strings = max(stringbuffer->max_strings * 2, 128);
                while (stringbuffer->max_strings <= strindex)
                        stringbuffer->max_strings *= 2;
-               stringbuffer->strings = Mem_Alloc(prog->progs_mempool, stringbuffer->max_strings * sizeof(stringbuffer->strings[0]));
+               stringbuffer->strings = (char **) Mem_Alloc(prog->progs_mempool, stringbuffer->max_strings * sizeof(stringbuffer->strings[0]));
                if (stringbuffer->num_strings > 0)
                        memcpy(stringbuffer->strings, oldstrings, stringbuffer->num_strings * sizeof(stringbuffer->strings[0]));
                if (oldstrings)
@@ -4035,7 +4088,7 @@ void VM_buf_create (void)
        prvm_stringbuffer_t *stringbuffer;
        int i;
        VM_SAFEPARMCOUNT(0, VM_buf_create);
-       stringbuffer = Mem_ExpandableArray_AllocRecord(&prog->stringbuffersarray);
+       stringbuffer = (prvm_stringbuffer_t *) Mem_ExpandableArray_AllocRecord(&prog->stringbuffersarray);
        for (i = 0;stringbuffer != Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, i);i++);
        stringbuffer->origin = PRVM_AllocationOrigin();
        PRVM_G_FLOAT(OFS_RETURN) = i;
@@ -4397,6 +4450,7 @@ void VM_buf_cvarlist(void)
        const char *partial, *antipartial;
        size_t len, antilen;
        size_t alloclen;
+       qboolean ispattern, antiispattern;
        int n;
        prvm_stringbuffer_t     *stringbuffer;
        VM_SAFEPARMCOUNTRANGE(2, 3, VM_buf_cvarlist);
@@ -4430,11 +4484,18 @@ void VM_buf_cvarlist(void)
                Mem_Free(stringbuffer->strings);
        stringbuffer->strings = NULL;
 
+       ispattern = partial && (strchr(partial, '*') || strchr(partial, '?'));
+       antiispattern = antipartial && (strchr(antipartial, '*') || strchr(antipartial, '?'));
+
        n = 0;
        for(cvar = cvar_vars; cvar; cvar = cvar->next)
        {
-               if(partial && strncasecmp(partial, cvar->name, len))
+               if(len && (ispattern ? !matchpattern_with_separator(cvar->name, partial, false, "", false) : strncmp(partial, cvar->name, len)))
                        continue;
+
+               if(antilen && (antiispattern ? matchpattern_with_separator(cvar->name, antipartial, false, "", false) : !strncmp(antipartial, cvar->name, antilen)))
+                       continue;
+
                ++n;
        }
 
@@ -4445,10 +4506,10 @@ void VM_buf_cvarlist(void)
        n = 0;
        for(cvar = cvar_vars; cvar; cvar = cvar->next)
        {
-               if(len && strncasecmp(partial, cvar->name, len))
+               if(len && (ispattern ? !matchpattern_with_separator(cvar->name, partial, false, "", false) : strncmp(partial, cvar->name, len)))
                        continue;
 
-               if(antilen && !strncasecmp(antipartial, cvar->name, antilen))
+               if(antilen && (antiispattern ? matchpattern_with_separator(cvar->name, antipartial, false, "", false) : !strncmp(antipartial, cvar->name, antilen)))
                        continue;
 
                alloclen = strlen(cvar->name) + 1;
@@ -4609,7 +4670,7 @@ void VM_strstrofs (void)
        VM_SAFEPARMCOUNTRANGE(2, 3, VM_strstrofs);
        instr = PRVM_G_STRING(OFS_PARM0);
        match = PRVM_G_STRING(OFS_PARM1);
-       firstofs = (prog->argc > 2)?PRVM_G_FLOAT(OFS_PARM2):0;
+       firstofs = (prog->argc > 2)?(int)PRVM_G_FLOAT(OFS_PARM2):0;
 
        if (firstofs && (firstofs < 0 || firstofs > (int)strlen(instr)))
        {
@@ -4738,9 +4799,9 @@ void VM_strconv (void)
 
        VM_SAFEPARMCOUNTRANGE(3, 8, VM_strconv);
 
-       ccase = PRVM_G_FLOAT(OFS_PARM0);        //0 same, 1 lower, 2 upper
-       redalpha = PRVM_G_FLOAT(OFS_PARM1);     //0 same, 1 white, 2 red,  5 alternate, 6 alternate-alternate
-       rednum = PRVM_G_FLOAT(OFS_PARM2);       //0 same, 1 white, 2 red, 3 redspecial, 4 whitespecial, 5 alternate, 6 alternate-alternate
+       ccase = (int) PRVM_G_FLOAT(OFS_PARM0);  //0 same, 1 lower, 2 upper
+       redalpha = (int) PRVM_G_FLOAT(OFS_PARM1);       //0 same, 1 white, 2 red,  5 alternate, 6 alternate-alternate
+       rednum = (int) PRVM_G_FLOAT(OFS_PARM2); //0 same, 1 white, 2 red, 3 redspecial, 4 whitespecial, 5 alternate, 6 alternate-alternate
        VM_VarString(3, (char *) resbuf, sizeof(resbuf));
        len = strlen((char *) resbuf);
 
@@ -4783,7 +4844,7 @@ void VM_strpad (void)
        char destbuf[VM_STRINGTEMP_LENGTH];
        int pad;
        VM_SAFEPARMCOUNTRANGE(1, 8, VM_strpad);
-       pad = PRVM_G_FLOAT(OFS_PARM0);
+       pad = (int) PRVM_G_FLOAT(OFS_PARM0);
        VM_VarString(1, src, sizeof(src));
 
        // note: < 0 = left padding, > 0 = right padding,
@@ -5038,7 +5099,7 @@ uri_to_prog_t;
 
 static void uri_to_string_callback(int status, size_t length_received, unsigned char *buffer, void *cbdata)
 {
-       uri_to_prog_t *handle = cbdata;
+       uri_to_prog_t *handle = (uri_to_prog_t *) cbdata;
 
        if(!PRVM_ProgLoaded(handle->prognr))
        {
@@ -5081,7 +5142,7 @@ void VM_uri_get (void)
 
        url = PRVM_G_STRING(OFS_PARM0);
        id = PRVM_G_FLOAT(OFS_PARM1);
-       handle = Z_Malloc(sizeof(*handle)); // this can't be the prog's mem pool, as curl may call the callback later!
+       handle = (uri_to_prog_t *) Z_Malloc(sizeof(*handle)); // this can't be the prog's mem pool, as curl may call the callback later!
 
        handle->prognr = PRVM_GetProgNr();
        handle->starttime = prog->starttime;
@@ -5110,7 +5171,7 @@ void VM_netaddress_resolve (void)
        ip = PRVM_G_STRING(OFS_PARM0);
        port = 0;
        if(prog->argc > 1)
-               port = PRVM_G_FLOAT(OFS_PARM1);
+               port = (int) PRVM_G_FLOAT(OFS_PARM1);
 
        if(LHNETADDRESS_FromString(&addr, ip, port) && LHNETADDRESS_ToString(&addr, normalized, sizeof(normalized), prog->argc > 1))
                PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(normalized);