]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - prvm_cmds.c
extresponse: make svqc receive only those on the server socket, and csqc/menuqc only...
[xonotic/darkplaces.git] / prvm_cmds.c
index a644f1a2e3ef76e4571abfeb6c5e9079cef8d3bc..755c0802c0449cde47a23dd0d650e7b0f2e6a927 100644 (file)
@@ -1090,7 +1090,7 @@ void VM_precache_sound (void)
        PRVM_G_INT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0);
        VM_CheckEmptyString(s);
 
-       if(snd_initialized.integer && !S_PrecacheSound(s, true, false))
+       if(snd_initialized.integer && !S_PrecacheSound(s, true, true))
        {
                VM_Warning("VM_precache_sound: Failed to load %s for %s\n", s, PRVM_NAME);
                return;
@@ -1568,6 +1568,12 @@ void VM_pow (void)
        PRVM_G_FLOAT(OFS_RETURN) = pow(PRVM_G_FLOAT(OFS_PARM0), PRVM_G_FLOAT(OFS_PARM1));
 }
 
+void VM_log (void)
+{
+       VM_SAFEPARMCOUNT(1,VM_log);
+       PRVM_G_FLOAT(OFS_RETURN) = log(PRVM_G_FLOAT(OFS_PARM0));
+}
+
 void VM_Files_Init(void)
 {
        int i;
@@ -2101,7 +2107,7 @@ string    substring(string s, float start, float length)
 // returns a section of a string as a tempstring
 void VM_substring(void)
 {
-       int i, start, length;
+       int start, length, slength, maxlen;
        const char *s;
        char string[VM_STRINGTEMP_LENGTH];
 
@@ -2110,10 +2116,19 @@ void VM_substring(void)
        s = PRVM_G_STRING(OFS_PARM0);
        start = (int)PRVM_G_FLOAT(OFS_PARM1);
        length = (int)PRVM_G_FLOAT(OFS_PARM2);
-       for (i = 0;i < start && *s;i++, s++);
-       for (i = 0;i < (int)sizeof(string) - 1 && *s && i < length;i++, s++)
-               string[i] = *s;
-       string[i] = 0;
+       slength = strlen(s);
+
+       if (start < 0) // FTE_STRINGS feature
+               start += slength;
+       start = bound(0, start, slength);
+
+       if (length < 0) // FTE_STRINGS feature
+               length += slength - start + 1;
+       maxlen = min((int)sizeof(string) - 1, slength - start);
+       length = bound(0, length, maxlen);
+
+       memcpy(string, s + start, length);
+       string[length] = 0;
        PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(string);
 }
 
@@ -2601,6 +2616,7 @@ float     gettime(void)
 =========
 */
 extern double host_starttime;
+float CDAudio_GetPosition(void);
 void VM_gettime(void)
 {
        int timer_index;
@@ -2626,7 +2642,10 @@ void VM_gettime(void)
                 PRVM_G_FLOAT(OFS_RETURN) = (float) (Sys_DoubleTime() - realtime);
                 break;
             case 3: // GETTIME_UPTIME
-                PRVM_G_FLOAT(OFS_RETURN) = (float) Sys_DoubleTime() - host_starttime;
+                PRVM_G_FLOAT(OFS_RETURN) = (float) (Sys_DoubleTime() - host_starttime);
+                break;
+            case 4: // GETTIME_CDTRACK
+                PRVM_G_FLOAT(OFS_RETURN) = (float) CDAudio_GetPosition();
                 break;
                        default:
                                VM_Warning("VM_gettime: %s: unsupported timer specified, returning realtime\n", PRVM_NAME);
@@ -2961,7 +2980,7 @@ void VM_freepic(void)
        Draw_FreePic(s);
 }
 
-dp_font_t *getdrawfont()
+dp_font_t *getdrawfont(void)
 {
        if(prog->globaloffsets.drawfont >= 0)
        {
@@ -3107,19 +3126,30 @@ void VM_drawcolorcodedstring(void)
 =========
 VM_stringwidth
 
-float  stringwidth(string text, float allowColorCodes)
+float  stringwidth(string text, float allowColorCodes, float size)
 =========
 */
 void VM_stringwidth(void)
 {
        const char  *string;
+       float sz, mult; // sz is intended font size so we can later add freetype support, mult is font size multiplier in pixels per character cell
        int colors;
-       VM_SAFEPARMCOUNT(2,VM_drawstring);
+       VM_SAFEPARMCOUNTRANGE(2,3,VM_drawstring);
+
+       if(prog->argc == 3)
+       {
+               mult = sz = PRVM_G_FLOAT(OFS_PARM2);
+       }
+       else
+       {
+               sz = 8;
+               mult = 1;
+       }
 
        string = PRVM_G_STRING(OFS_PARM0);
        colors = (int)PRVM_G_FLOAT(OFS_PARM1);
 
-       PRVM_G_FLOAT(OFS_RETURN) = DrawQ_TextWidth_Font(string, 0, !colors, getdrawfont()); // 1x1 characters, don't actually draw
+       PRVM_G_FLOAT(OFS_RETURN) = DrawQ_TextWidth_Font(string, 0, !colors, getdrawfont()) * mult; // 1x1 characters, don't actually draw
 }
 /*
 =========
@@ -3167,6 +3197,51 @@ void VM_drawpic(void)
 }
 /*
 =========
+VM_drawrotpic
+
+float  drawrotpic(vector position, string pic, vector size, vector org, float angle, vector rgb, float alpha, float flag)
+=========
+*/
+void VM_drawrotpic(void)
+{
+       const char *picname;
+       float *size, *pos, *org, *rgb;
+       int flag;
+
+       VM_SAFEPARMCOUNT(8,VM_drawrotpic);
+
+       picname = PRVM_G_STRING(OFS_PARM1);
+       VM_CheckEmptyString (picname);
+
+       // is pic cached ? no function yet for that
+       if(!1)
+       {
+               PRVM_G_FLOAT(OFS_RETURN) = -4;
+               VM_Warning("VM_drawrotpic: %s: %s not cached !\n", PRVM_NAME, picname);
+               return;
+       }
+
+       pos = PRVM_G_VECTOR(OFS_PARM0);
+       size = PRVM_G_VECTOR(OFS_PARM2);
+       org = PRVM_G_VECTOR(OFS_PARM3);
+       rgb = PRVM_G_VECTOR(OFS_PARM5);
+       flag = (int) PRVM_G_FLOAT(OFS_PARM7);
+
+       if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
+       {
+               PRVM_G_FLOAT(OFS_RETURN) = -2;
+               VM_Warning("VM_drawrotpic: %s: wrong DRAWFLAG %i !\n",PRVM_NAME,flag);
+               return;
+       }
+
+       if(pos[2] || size[2] || org[2])
+               Con_Printf("VM_drawrotpic: z value from pos/size/org discarded\n");
+
+       DrawQ_RotPic(pos[0], pos[1], Draw_CachePic(picname), size[0], size[1], org[0], org[1], PRVM_G_FLOAT(OFS_PARM4), rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM6), flag);
+       PRVM_G_FLOAT(OFS_RETURN) = 1;
+}
+/*
+=========
 VM_drawsubpic
 
 float  drawsubpic(vector position, vector size, string pic, vector srcPos, vector srcSize, vector rgb, float alpha, float flag)
@@ -3808,7 +3883,7 @@ void VM_bitshift (void)
        int n1, n2;
        VM_SAFEPARMCOUNT(2, VM_bitshift);
 
-       n1 = (int)fabs((int)PRVM_G_FLOAT(OFS_PARM0));
+       n1 = (int)fabs((float)((int)PRVM_G_FLOAT(OFS_PARM0)));
        n2 = (int)PRVM_G_FLOAT(OFS_PARM1);
        if(!n1)
                PRVM_G_FLOAT(OFS_RETURN) = n1;
@@ -4975,6 +5050,38 @@ void VM_SetTraceGlobals(const trace_t *trace)
                val->string = trace->hittexture ? PRVM_SetTempString(trace->hittexture->name) : 0;
 }
 
+void VM_ClearTraceGlobals(void)
+{
+       // clean up all trace globals when leaving the VM (anti-triggerbot safeguard)
+       prvm_eval_t *val;
+       if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_allsolid)))
+               val->_float = 0;
+       if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_startsolid)))
+               val->_float = 0;
+       if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_fraction)))
+               val->_float = 0;
+       if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_inwater)))
+               val->_float = 0;
+       if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_inopen)))
+               val->_float = 0;
+       if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_endpos)))
+               VectorClear(val->vector);
+       if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_plane_normal)))
+               VectorClear(val->vector);
+       if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_plane_dist)))
+               val->_float = 0;
+       if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_ent)))
+               val->edict = PRVM_EDICT_TO_PROG(prog->edicts);
+       if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dpstartcontents)))
+               val->_float = 0;
+       if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dphitcontents)))
+               val->_float = 0;
+       if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dphitq3surfaceflags)))
+               val->_float = 0;
+       if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_dphittexturename)))
+               val->string = 0;
+}
+
 //=============
 
 void VM_Cmd_Init(void)
@@ -5178,3 +5285,103 @@ void VM_netaddress_resolve (void)
        else
                PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString("");
 }
+
+//string(void) getextresponse = #624; // returns the next extResponse packet that was sent to this client
+void VM_CL_getextresponse (void)
+{
+       VM_SAFEPARMCOUNT(0,VM_argv);
+
+       if (net_extresponse_count <= 0)
+               PRVM_G_INT(OFS_RETURN) = OFS_NULL;
+       else
+       {
+               int first;
+               --net_extresponse_count;
+               first = (net_extresponse_last + NET_EXTRESPONSE_MAX - net_extresponse_count) % NET_EXTRESPONSE_MAX;
+               PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(net_extresponse[first]);
+       }
+}
+
+void VM_SV_getextresponse (void)
+{
+       VM_SAFEPARMCOUNT(0,VM_argv);
+
+       if (sv_net_extresponse_count <= 0)
+               PRVM_G_INT(OFS_RETURN) = OFS_NULL;
+       else
+       {
+               int first;
+               --sv_net_extresponse_count;
+               first = (sv_net_extresponse_last + NET_EXTRESPONSE_MAX - sv_net_extresponse_count) % NET_EXTRESPONSE_MAX;
+               PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(sv_net_extresponse[first]);
+       }
+}
+
+/*
+=========
+VM_M_callfunction
+
+       callfunction(...,string function_name)
+Extension: pass
+=========
+*/
+mfunction_t *PRVM_ED_FindFunction (const char *name);
+void VM_callfunction(void)
+{
+       mfunction_t *func;
+       const char *s;
+
+       VM_SAFEPARMCOUNTRANGE(1, 8, VM_callfunction);
+
+       s = PRVM_G_STRING(OFS_PARM0+(prog->argc - 1)*3);
+
+       VM_CheckEmptyString(s);
+
+       func = PRVM_ED_FindFunction(s);
+
+       if(!func)
+               PRVM_ERROR("VM_callfunciton: function %s not found !", 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; most likely cause: outdated engine build. Try updating!", builtinnumber, PRVM_NAME);
+       }
+       else if(func - prog->functions > 0)
+       {
+               prog->argc--;
+               PRVM_ExecuteProgram(func - prog->functions,"");
+               prog->argc++;
+       }
+}
+
+/*
+=========
+VM_isfunction
+
+float  isfunction(string function_name)
+=========
+*/
+mfunction_t *PRVM_ED_FindFunction (const char *name);
+void VM_isfunction(void)
+{
+       mfunction_t *func;
+       const char *s;
+
+       VM_SAFEPARMCOUNT(1, VM_isfunction);
+
+       s = PRVM_G_STRING(OFS_PARM0);
+
+       VM_CheckEmptyString(s);
+
+       func = PRVM_ED_FindFunction(s);
+
+       if(!func)
+               PRVM_G_FLOAT(OFS_RETURN) = false;
+       else
+               PRVM_G_FLOAT(OFS_RETURN) = true;
+}