X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=svvm_cmds.c;h=c251f370ab6529160a17ee9f2e4f10d7468e619f;hp=5dae1f94f7765530b0a5aebd685b089998c22732;hb=52833855527530cf136cebeabbe55e268de17c0d;hpb=598fddaa9633afd444cb95d8e7eb74d9b05b899d

diff --git a/svvm_cmds.c b/svvm_cmds.c
index 5dae1f94..c251f370 100644
--- a/svvm_cmds.c
+++ b/svvm_cmds.c
@@ -8,6 +8,8 @@ cvar_t sv_aim = {CVAR_SAVE, "sv_aim", "2"}; //"0.93"}; // LordHavoc: disabled au
 
 
 char *vm_sv_extensions =
+"DP_CON_EXPANDCVAR "
+"DP_CON_ALIASPARAMETERS "
 "DP_BUTTONCHAT "
 "DP_BUTTONUSE "
 "DP_CL_LOADSKY "
@@ -24,6 +26,7 @@ char *vm_sv_extensions =
 "DP_EF_RED "
 "DP_EF_STARDUST "
 "DP_ENT_ALPHA "
+"DP_ENT_COLORMOD "
 "DP_ENT_CUSTOMCOLORMAP "
 "DP_ENT_EXTERIORMODELTOCLIENT "
 "DP_ENT_GLOW "
@@ -86,10 +89,12 @@ char *vm_sv_extensions =
 "DP_SV_NODRAWTOCLIENT "
 "DP_SV_PING "
 "DP_SV_PLAYERPHYSICS "
+"DP_SV_PRECACHEANYTIME "
 "DP_SV_PUNCHVECTOR "
 "DP_SV_ROTATINGBMODEL "
 "DP_SV_SETCOLOR "
 "DP_SV_SLOWMO "
+"DP_SV_WRITEUNTERMINATEDSTRING "
 "DP_TE_BLOOD "
 "DP_TE_BLOODSHOWER "
 "DP_TE_CUSTOMFLASH "
@@ -113,7 +118,6 @@ char *vm_sv_extensions =
 "TENEBRAE_GFX_DLIGHTS "
 "TW_SV_STEPCONTROL "
 "NEXUIZ_PLAYERMODEL "
-"NEXUIZ_PLAYERSKIN "
 ;
 
 /*
@@ -739,63 +743,6 @@ void PF_findradius (void)
 	VM_RETURN_EDICT(chain);
 }
 
-// LordHavoc: search for flags in float fields
-void PF_findflags (void)
-{
-	int		e;
-	int		f;
-	int		s;
-	prvm_edict_t	*ed;
-
-	e = PRVM_G_EDICTNUM(OFS_PARM0);
-	f = PRVM_G_INT(OFS_PARM1);
-	s = (int)PRVM_G_FLOAT(OFS_PARM2);
-
-	for (e++ ; e < prog->num_edicts ; e++)
-	{
-		prog->xfunction->builtinsprofile++;
-		ed = PRVM_EDICT_NUM(e);
-		if (ed->priv.server->free)
-			continue;
-		if ((int)PRVM_E_FLOAT(ed,f) & s)
-		{
-			VM_RETURN_EDICT(ed);
-			return;
-		}
-	}
-
-	VM_RETURN_EDICT(prog->edicts);
-}
-
-// LordHavoc: chained search for flags in float fields
-void PF_findchainflags (void)
-{
-	int		i;
-	int		f;
-	int		s;
-	prvm_edict_t	*ent, *chain;
-
-	chain = (prvm_edict_t *)prog->edicts;
-
-	f = PRVM_G_INT(OFS_PARM0);
-	s = (int)PRVM_G_FLOAT(OFS_PARM1);
-
-	ent = PRVM_NEXT_EDICT(prog->edicts);
-	for (i = 1;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent))
-	{
-		prog->xfunction->builtinsprofile++;
-		if (ent->priv.server->free)
-			continue;
-		if (!((int)PRVM_E_FLOAT(ent,f) & s))
-			continue;
-
-		ent->fields.server->chain = PRVM_EDICT_TO_PROG(chain);
-		chain = ent;
-	}
-
-	VM_RETURN_EDICT(chain);
-}
-
 void PF_precache_file (void)
 {	// precache_file is only used to copy files with qcc, it does nothing
 	PRVM_G_INT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0);
@@ -917,6 +864,10 @@ void PF_lightstyle (void)
 	style = PRVM_G_FLOAT(OFS_PARM0);
 	val = PRVM_G_STRING(OFS_PARM1);
 
+	if( (unsigned) style >= MAX_LIGHTSTYLES ) {
+		PRVM_ERROR( "PF_lightstyle: style: %i >= 64", style );
+	}
+
 // change the string in sv
 	strlcpy(sv.lightstyles[style], val, sizeof(sv.lightstyles[style]));
 
@@ -1236,6 +1187,11 @@ void PF_WriteString (void)
 	MSG_WriteString (WriteDest(), PRVM_G_STRING(OFS_PARM1));
 }
 
+void PF_WriteUnterminatedString (void)
+{
+	MSG_WriteUnterminatedString (WriteDest(), PRVM_G_STRING(OFS_PARM1));
+}
+
 
 void PF_WriteEntity (void)
 {
@@ -2513,14 +2469,14 @@ VM_search_end,				// #445 void(float handle) search_end (DP_FS_SEARCH)
 VM_search_getsize,			// #446 float(float handle) search_getsize (DP_FS_SEARCH)
 VM_search_getfilename,		// #447 string(float handle, float num) search_getfilename (DP_FS_SEARCH)
 VM_cvar_string,				// #448 string(string s) cvar_string (DP_QC_CVAR_STRING)
-PF_findflags,				// #449 entity(entity start, .float fld, float match) findflags (DP_QC_FINDFLAGS)
-PF_findchainflags,			// #450 entity(.float fld, float match) findchainflags (DP_QC_FINDCHAINFLAGS)
+VM_findflags,				// #449 entity(entity start, .float fld, float match) findflags (DP_QC_FINDFLAGS)
+VM_findchainflags,			// #450 entity(.float fld, float match) findchainflags (DP_QC_FINDCHAINFLAGS)
 PF_gettagindex,				// #451 float(entity ent, string tagname) gettagindex (DP_QC_GETTAGINFO)
 PF_gettaginfo,				// #452 vector(entity ent, float tagindex) gettaginfo (DP_QC_GETTAGINFO)
 PF_dropclient,				// #453 void(entity clent) dropclient (DP_SV_DROPCLIENT)
 PF_spawnclient,				// #454 entity() spawnclient (DP_SV_BOTCLIENT)
 PF_clienttype,				// #455 float(entity clent) clienttype (DP_SV_BOTCLIENT)
-NULL,						// #456
+PF_WriteUnterminatedString,	// #456 void(float to, string s) WriteUnterminatedString (DP_SV_WRITEUNTERMINATEDSTRING)
 NULL,						// #457
 NULL,						// #458
 NULL,						// #459