X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=prvm_cmds.c;h=d875d0347963103cbcddec60c5e800b363a6311c;hb=4f0f1d15ebb91d53c1d449cf96f6be3791566edc;hp=a819196f4a0a74933b9dbb50efa33aa781d6f18c;hpb=27ad2d336694ea2dc50035130bae321316e3936f;p=xonotic%2Fdarkplaces.git

diff --git a/prvm_cmds.c b/prvm_cmds.c
index a819196f..d875d034 100644
--- 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;
 	}
 
@@ -1068,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;
@@ -2079,7 +2101,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];
 
@@ -2088,10 +2110,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);
 }
 
@@ -2290,9 +2321,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 +2406,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 +2434,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 +2450,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 +2609,44 @@ VM_gettime
 float	gettime(void)
 =========
 */
+extern double host_starttime;
+float CDAudio_GetPosition(void);
 void VM_gettime(void)
 {
-	VM_SAFEPARMCOUNT(0,VM_gettime);
+	int timer_index;
+
+	VM_SAFEPARMCOUNTRANGE(0,1,VM_gettime);
 
-	PRVM_G_FLOAT(OFS_RETURN) = (float) realtime;
+	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;
+            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);
+				PRVM_G_FLOAT(OFS_RETURN) = (float) realtime;
+				break;
+		}
+	}
 }
 
 /*
@@ -2908,7 +2974,7 @@ void VM_freepic(void)
 	Draw_FreePic(s);
 }
 
-dp_font_t *getdrawfont()
+dp_font_t *getdrawfont(void)
 {
 	if(prog->globaloffsets.drawfont >= 0)
 	{
@@ -3054,19 +3120,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
 }
 /*
 =========
@@ -3114,6 +3191,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)
@@ -3755,7 +3877,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;
@@ -4922,6 +5044,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)
@@ -5125,3 +5279,19 @@ 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_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]);
+	}
+}