X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=pr_cmds.c;h=15e8c7f888032b041c5a0e711f3937a62f66c336;hp=0f801f8a4e6f6afd8ea26343ed5b957408b9f160;hb=832ba0937327c893bfd49f1a738812dae1a995a5;hpb=d3b158411b1d81181e05f750d9a7b0b2268438e2

diff --git a/pr_cmds.c b/pr_cmds.c
index 0f801f8a..15e8c7f8 100644
--- a/pr_cmds.c
+++ b/pr_cmds.c
@@ -25,11 +25,23 @@ cvar_t pr_zone_min_strings = {0, "pr_zone_min_strings", "64"};
 
 mempool_t *pr_strings_mempool;
 
-#define MAX_VARSTRING 4096
+// LordHavoc: added this to semi-fix the problem of using many ftos calls in a print
+#define STRINGTEMP_BUFFERS 16
+#define STRINGTEMP_LENGTH 4096
+static char pr_string_temp[STRINGTEMP_BUFFERS][STRINGTEMP_LENGTH];
+static int pr_string_tempindex = 0;
 
-char pr_varstring_temp[MAX_VARSTRING];
+static char *PR_GetTempString(void)
+{
+	char *s;
+	s = pr_string_temp[pr_string_tempindex];
+	pr_string_tempindex = (pr_string_tempindex + 1) % STRINGTEMP_BUFFERS;
+	return s;
+}
 
-#define	RETURN_EDICT(e) (((int *)pr_globals)[OFS_RETURN] = EDICT_TO_PROG(e))
+#define	RETURN_EDICT(e) (G_INT(OFS_RETURN) = EDICT_TO_PROG(e))
+#define PF_WARNING(s) do{Con_Printf(s);PR_PrintState();return;}while(0)
+#define PF_ERROR(s) do{Host_Error(s);return;}while(0)
 
 
 /*
@@ -41,14 +53,13 @@ char pr_varstring_temp[MAX_VARSTRING];
 */
 
 
-char *PF_VarString (int first)
+void PF_VarString(int first, char *out, int outlength)
 {
 	int i;
 	const char *s;
-	char *out, *outend;
+	char *outend;
 
-	out = pr_varstring_temp;
-	outend = pr_varstring_temp + sizeof(pr_varstring_temp) - 1;
+	outend = out + outlength - 1;
 	for (i = first;i < pr_argc && out < outend;i++)
 	{
 		s = G_STRING((OFS_PARM0+i*3));
@@ -56,23 +67,24 @@ char *PF_VarString (int first)
 			*out++ = *s++;
 	}
 	*out++ = 0;
-	return pr_varstring_temp;
 }
 
 char *ENGINE_EXTENSIONS =
 "DP_CL_LOADSKY "
-"DP_EF_NODRAW "
 "DP_EF_ADDITIVE "
 "DP_EF_BLUE "
-"DP_EF_RED "
-"DP_EF_FULLBRIGHT "
 "DP_EF_FLAME "
+"DP_EF_FULLBRIGHT "
+"DP_EF_NODEPTHTEST "
+"DP_EF_NODRAW "
+"DP_EF_NOSHADOW "
+"DP_EF_RED "
 "DP_EF_STARDUST "
 "DP_ENT_ALPHA "
 "DP_ENT_CUSTOMCOLORMAP "
 "DP_ENT_EXTERIORMODELTOCLIENT "
-"DP_ENT_LOWPRECISION "
 "DP_ENT_GLOW "
+"DP_ENT_LOWPRECISION "
 "DP_ENT_SCALE "
 "DP_ENT_VIEWMODEL "
 "DP_GFX_EXTERNALTEXTURES "
@@ -83,26 +95,37 @@ char *ENGINE_EXTENSIONS =
 "DP_HALFLIFE_MAP "
 "DP_HALFLIFE_MAP_CVAR "
 "DP_INPUTBUTTONS "
+"DP_LITSUPPORT "
 "DP_MONSTERWALK "
 "DP_MOVETYPEBOUNCEMISSILE "
 "DP_MOVETYPEFOLLOW "
 "DP_QC_CHANGEPITCH "
 "DP_QC_COPYENTITY "
+"DP_QC_CVAR_STRING "
 "DP_QC_ETOS "
 "DP_QC_FINDCHAIN "
+"DP_QC_FINDCHAINFLAGS "
 "DP_QC_FINDCHAINFLOAT "
+"DP_QC_FINDFLAGS "
 "DP_QC_FINDFLOAT "
+"DP_QC_FS_SEARCH " // Black: same as in the menu qc
 "DP_QC_GETLIGHT "
 "DP_QC_GETSURFACE "
 "DP_QC_MINMAXBOUND "
+"DP_QC_MULTIPLETEMPSTRINGS "
 "DP_QC_RANDOMVEC "
 "DP_QC_SINCOSSQRTPOW "
 "DP_QC_TRACEBOX "
 "DP_QC_TRACETOSS "
+"DP_QC_TRACE_MOVETYPE_HITMODEL "
+"DP_QC_TRACE_MOVETYPE_WORLDONLY "
 "DP_QC_VECTORVECTORS "
 "DP_QUAKE2_MODEL "
 "DP_QUAKE3_MODEL "
 "DP_REGISTERCVAR "
+"DP_SND_DIRECTIONLESSATTNNONE "
+"DP_SND_OGGVORBIS "
+"DP_SND_STEREOWAV "
 "DP_SOLIDCORPSE "
 "DP_SPRITE32 "
 "DP_SV_DRAWONLYTOCLIENT "
@@ -110,6 +133,7 @@ char *ENGINE_EXTENSIONS =
 "DP_SV_EXTERIORMODELTOCLIENT "
 "DP_SV_NODRAWTOCLIENT "
 "DP_SV_PLAYERPHYSICS "
+"DP_SV_ROTATINGBMODEL "
 "DP_SV_SETCOLOR "
 "DP_SV_SLOWMO "
 "DP_TE_BLOOD "
@@ -130,6 +154,8 @@ char *ENGINE_EXTENSIONS =
 "KRIMZON_SV_PARSECLIENTCOMMAND "
 "NEH_CMD_PLAY2 "
 "NEH_RESTOREGAME "
+"NXQ_GFX_LETTERBOX "
+"TENEBRAE_GFX_DLIGHTS "
 "TW_SV_STEPCONTROL "
 ;
 
@@ -180,15 +206,15 @@ error(value)
 */
 void PF_error (void)
 {
-	char	*s;
 	edict_t	*ed;
+	char string[STRINGTEMP_LENGTH];
 
-	s = PF_VarString(0);
-	Con_Printf ("======SERVER ERROR in %s:\n%s\n", PR_GetString(pr_xfunction->s_name), s);
+	PF_VarString(0, string, sizeof(string));
+	Con_Printf("======SERVER ERROR in %s:\n%s\n", PR_GetString(pr_xfunction->s_name), string);
 	ed = PROG_TO_EDICT(pr_global_struct->self);
-	ED_Print (ed);
+	ED_Print(ed);
 
-	Host_Error ("Program error");
+	PF_ERROR("Program error");
 }
 
 /*
@@ -203,13 +229,13 @@ objerror(value)
 */
 void PF_objerror (void)
 {
-	char	*s;
 	edict_t	*ed;
+	char string[STRINGTEMP_LENGTH];
 
-	s = PF_VarString(0);
-	Con_Printf ("======OBJECT ERROR in %s:\n%s\n", PR_GetString(pr_xfunction->s_name), s);
+	PF_VarString(0, string, sizeof(string));
+	Con_Printf("======OBJECT ERROR in %s:\n%s\n", PR_GetString(pr_xfunction->s_name), string);
 	ed = PROG_TO_EDICT(pr_global_struct->self);
-	ED_Print (ed);
+	ED_Print(ed);
 	ED_Free (ed);
 }
 
@@ -256,6 +282,10 @@ void PF_setorigin (void)
 	float	*org;
 
 	e = G_EDICT(OFS_PARM0);
+	if (e == sv.edicts)
+		PF_WARNING("setorigin: can not modify world entity\n");
+	if (e->e->free)
+		PF_WARNING("setorigin: can not modify free entity\n");
 	org = G_VECTOR(OFS_PARM1);
 	VectorCopy (org, e->v->origin);
 	SV_LinkEdict (e, false);
@@ -268,7 +298,7 @@ void SetMinMaxSize (edict_t *e, float *min, float *max, qboolean rotate)
 
 	for (i=0 ; i<3 ; i++)
 		if (min[i] > max[i])
-			Host_Error ("backwards mins/maxs");
+			PF_ERROR("SetMinMaxSize: backwards mins/maxs\n");
 
 // set derived values
 	VectorCopy (min, e->v->mins);
@@ -294,6 +324,10 @@ void PF_setsize (void)
 	float	*min, *max;
 
 	e = G_EDICT(OFS_PARM0);
+	if (e == sv.edicts)
+		PF_WARNING("setsize: can not modify world entity\n");
+	if (e->e->free)
+		PF_WARNING("setsize: can not modify free entity\n");
 	min = G_VECTOR(OFS_PARM1);
 	max = G_VECTOR(OFS_PARM2);
 	SetMinMaxSize (e, min, max, false);
@@ -315,6 +349,10 @@ void PF_setmodel (void)
 	int		i;
 
 	e = G_EDICT(OFS_PARM0);
+	if (e == sv.edicts)
+		PF_WARNING("setmodel: can not modify world entity\n");
+	if (e->e->free)
+		PF_WARNING("setmodel: can not modify free entity\n");
 	m = G_STRING(OFS_PARM1);
 
 // check to see if model was properly precached
@@ -323,7 +361,7 @@ void PF_setmodel (void)
 			break;
 
 	if (!*check)
-		Host_Error ("no precache: %s\n", m);
+		PF_WARNING("setmodel: no precache\n");
 
 
 	e->v->model = PR_SetString(*check);
@@ -348,10 +386,9 @@ bprint(value)
 */
 void PF_bprint (void)
 {
-	char		*s;
-
-	s = PF_VarString(0);
-	SV_BroadcastPrintf ("%s", s);
+	char string[STRINGTEMP_LENGTH];
+	PF_VarString(0, string, sizeof(string));
+	SV_BroadcastPrint(string);
 }
 
 /*
@@ -365,22 +402,24 @@ sprint(clientent, value)
 */
 void PF_sprint (void)
 {
-	char		*s;
 	client_t	*client;
 	int			entnum;
+	char string[STRINGTEMP_LENGTH];
 
 	entnum = G_EDICTNUM(OFS_PARM0);
-	s = PF_VarString(1);
 
-	if (entnum < 1 || entnum > MAX_SCOREBOARD || !svs.connectedclients[entnum-1])
+	if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
 	{
-		Con_Printf ("tried to sprint to a non-client\n");
+		Con_Print("tried to sprint to a non-client\n");
 		return;
 	}
 
-	client = svs.connectedclients[entnum-1];
+	client = svs.clients + entnum-1;
+	if (!client->netconnection)
+		return;
+	PF_VarString(1, string, sizeof(string));
 	MSG_WriteChar(&client->message,svc_print);
-	MSG_WriteString(&client->message, s );
+	MSG_WriteString(&client->message, string);
 }
 
 
@@ -395,22 +434,24 @@ centerprint(clientent, value)
 */
 void PF_centerprint (void)
 {
-	char		*s;
 	client_t	*client;
 	int			entnum;
+	char string[STRINGTEMP_LENGTH];
 
 	entnum = G_EDICTNUM(OFS_PARM0);
-	s = PF_VarString(1);
 
-	if (entnum < 1 || entnum > MAX_SCOREBOARD || !svs.connectedclients[entnum-1])
+	if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
 	{
-		Con_Printf ("tried to sprint to a non-client\n");
+		Con_Print("tried to sprint to a non-client\n");
 		return;
 	}
 
-	client = svs.connectedclients[entnum-1];
+	client = svs.clients + entnum-1;
+	if (!client->netconnection)
+		return;
+	PF_VarString(1, string, sizeof(string));
 	MSG_WriteChar(&client->message,svc_centerprint);
-	MSG_WriteString(&client->message, s );
+	MSG_WriteString(&client->message, string);
 }
 
 
@@ -483,7 +524,7 @@ void PF_vectoyaw (void)
 		yaw = 0;
 	else
 	{
-		yaw = (int) (atan2(value1[1], value1[0]) * 180 / M_PI);
+		yaw = (atan2(value1[1], value1[0]) * 180 / M_PI);
 		if (yaw < 0)
 			yaw += 360;
 	}
@@ -501,11 +542,9 @@ vector vectoangles(vector)
 */
 void PF_vectoangles (void)
 {
-	float	*value1;
-	float	forward;
-	float	yaw, pitch;
+	double value1[3], forward, yaw, pitch;
 
-	value1 = G_VECTOR(OFS_PARM0);
+	VectorCopy(G_VECTOR(OFS_PARM0), value1);
 
 	if (value1[1] == 0 && value1[0] == 0)
 	{
@@ -530,14 +569,12 @@ void PF_vectoangles (void)
 			yaw = 270;
 
 		forward = sqrt(value1[0]*value1[0] + value1[1]*value1[1]);
-		pitch = (int) (atan2(value1[2], forward) * 180 / M_PI);
+		pitch = (atan2(value1[2], forward) * 180 / M_PI);
 		if (pitch < 0)
 			pitch += 360;
 	}
 
-	G_FLOAT(OFS_RETURN+0) = pitch;
-	G_FLOAT(OFS_RETURN+1) = yaw;
-	G_FLOAT(OFS_RETURN+2) = 0;
+	VectorSet(G_VECTOR(OFS_RETURN), pitch, yaw, 0);
 }
 
 /*
@@ -591,7 +628,7 @@ void PF_ambientsound (void)
 	char		*samp;
 	float		*pos;
 	float 		vol, attenuation;
-	int			i, soundnum, large;
+	int			soundnum, large;
 
 	pos = G_VECTOR (OFS_PARM0);
 	samp = G_STRING(OFS_PARM1);
@@ -605,7 +642,7 @@ void PF_ambientsound (void)
 
 	if (!*check)
 	{
-		Con_Printf ("no precache: %s\n", samp);
+		Con_Printf("no precache: %s\n", samp);
 		return;
 	}
 
@@ -620,8 +657,7 @@ void PF_ambientsound (void)
 	else
 		MSG_WriteByte (&sv.signon, svc_spawnstaticsound);
 
-	for (i=0 ; i<3 ; i++)
-		MSG_WriteDPCoord(&sv.signon, pos[i]);
+	MSG_WriteVector(&sv.signon, pos, sv.protocol);
 
 	if (large)
 		MSG_WriteShort (&sv.signon, soundnum);
@@ -663,13 +699,13 @@ void PF_sound (void)
 	attenuation = G_FLOAT(OFS_PARM4);
 
 	if (volume < 0 || volume > 255)
-		Host_Error ("SV_StartSound: volume = %i", volume);
+		PF_WARNING("SV_StartSound: volume must be in range 0-1\n");
 
 	if (attenuation < 0 || attenuation > 4)
-		Host_Error ("SV_StartSound: attenuation = %f", attenuation);
+		PF_WARNING("SV_StartSound: attenuation must be in range 0-4\n");
 
 	if (channel < 0 || channel > 7)
-		Host_Error ("SV_StartSound: channel = %i", channel);
+		PF_WARNING("SV_StartSound: channel must be in range 0-7\n");
 
 	SV_StartSound (entity, channel, sample, volume, attenuation);
 }
@@ -683,7 +719,7 @@ break()
 */
 void PF_break (void)
 {
-	Host_Error ("break statement");
+	PF_ERROR("break: break statement\n");
 }
 
 /*
@@ -701,17 +737,17 @@ void PF_traceline (void)
 {
 	float	*v1, *v2;
 	trace_t	trace;
-	int		nomonsters;
+	int		move;
 	edict_t	*ent;
 
 	pr_xfunction->builtinsprofile += 30;
 
 	v1 = G_VECTOR(OFS_PARM0);
 	v2 = G_VECTOR(OFS_PARM1);
-	nomonsters = G_FLOAT(OFS_PARM2);
+	move = G_FLOAT(OFS_PARM2);
 	ent = G_EDICT(OFS_PARM3);
 
-	trace = SV_Move (v1, vec3_origin, vec3_origin, v2, nomonsters, ent);
+	trace = SV_Move (v1, vec3_origin, vec3_origin, v2, move, ent);
 
 	pr_global_struct->trace_allsolid = trace.allsolid;
 	pr_global_struct->trace_startsolid = trace.startsolid;
@@ -745,7 +781,7 @@ void PF_tracebox (void)
 {
 	float	*v1, *v2, *m1, *m2;
 	trace_t	trace;
-	int		nomonsters;
+	int		move;
 	edict_t	*ent;
 
 	pr_xfunction->builtinsprofile += 30;
@@ -754,10 +790,10 @@ void PF_tracebox (void)
 	m1 = G_VECTOR(OFS_PARM1);
 	m2 = G_VECTOR(OFS_PARM2);
 	v2 = G_VECTOR(OFS_PARM3);
-	nomonsters = G_FLOAT(OFS_PARM4);
+	move = G_FLOAT(OFS_PARM4);
 	ent = G_EDICT(OFS_PARM5);
 
-	trace = SV_Move (v1, m1, m2, v2, nomonsters ? MOVE_NOMONSTERS : MOVE_NORMAL, ent);
+	trace = SV_Move (v1, m1, m2, v2, move, ent);
 
 	pr_global_struct->trace_allsolid = trace.allsolid;
 	pr_global_struct->trace_startsolid = trace.startsolid;
@@ -783,6 +819,8 @@ void PF_TraceToss (void)
 	pr_xfunction->builtinsprofile += 600;
 
 	ent = G_EDICT(OFS_PARM0);
+	if (ent == sv.edicts)
+		PF_WARNING("tracetoss: can not use world entity\n");
 	ignore = G_EDICT(OFS_PARM1);
 
 	trace = SV_Trace_Toss (ent, ignore);
@@ -829,8 +867,8 @@ int PF_newcheckclient (int check)
 
 // cycle to the next one
 
-	check = bound(1, check, MAX_SCOREBOARD);
-	if (check == MAX_SCOREBOARD)
+	check = bound(1, check, svs.maxclients);
+	if (check == svs.maxclients)
 		i = 1;
 	else
 		i = check + 1;
@@ -840,7 +878,7 @@ int PF_newcheckclient (int check)
 		// count the cost
 		pr_xfunction->builtinsprofile++;
 		// wrap around
-		if (i == MAX_SCOREBOARD+1)
+		if (i == svs.maxclients+1)
 			i = 1;
 		// look up the client's edict
 		ent = EDICT_NUM(i);
@@ -930,12 +968,15 @@ void PF_stuffcmd (void)
 	client_t	*old;
 
 	entnum = G_EDICTNUM(OFS_PARM0);
-	if (entnum < 1 || entnum > MAX_SCOREBOARD)
-		Host_Error ("Parm 0 not a client");
+	if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
+	{
+		Con_Print("Can't stuffcmd to a non-client\n");
+		return;
+	}
 	str = G_STRING(OFS_PARM1);
 
 	old = host_client;
-	if ((host_client = svs.connectedclients[entnum-1]))
+	if ((host_client = svs.clients + entnum-1) && host_client->netconnection)
 		Host_ClientCommands ("%s", str);
 	host_client = old;
 }
@@ -944,17 +985,14 @@ void PF_stuffcmd (void)
 =================
 PF_localcmd
 
-Sends text over to the client's execution buffer
+Sends text to server console
 
 localcmd (string)
 =================
 */
 void PF_localcmd (void)
 {
-	char	*str;
-
-	str = G_STRING(OFS_PARM0);
-	Cbuf_AddText (str);
+	Cbuf_AddText(G_STRING(OFS_PARM0));
 }
 
 /*
@@ -966,11 +1004,7 @@ float cvar (string)
 */
 void PF_cvar (void)
 {
-	char	*str;
-
-	str = G_STRING(OFS_PARM0);
-
-	G_FLOAT(OFS_RETURN) = Cvar_VariableValue (str);
+	G_FLOAT(OFS_RETURN) = Cvar_VariableValue(G_STRING(OFS_PARM0));
 }
 
 /*
@@ -982,12 +1016,7 @@ float cvar (string)
 */
 void PF_cvar_set (void)
 {
-	char	*var, *val;
-
-	var = G_STRING(OFS_PARM0);
-	val = G_STRING(OFS_PARM1);
-
-	Cvar_Set (var, val);
+	Cvar_Set(G_STRING(OFS_PARM0), G_STRING(OFS_PARM1));
 }
 
 /*
@@ -1046,21 +1075,12 @@ PF_dprint
 */
 void PF_dprint (void)
 {
-	Con_DPrintf ("%s",PF_VarString(0));
-}
-
-// LordHavoc: added this to semi-fix the problem of using many ftos calls in a print
-#define STRINGTEMP_BUFFERS 16
-#define STRINGTEMP_LENGTH 128
-static char pr_string_temp[STRINGTEMP_BUFFERS][STRINGTEMP_LENGTH];
-static int pr_string_tempindex = 0;
-
-static char *PR_GetTempString(void)
-{
-	char *s;
-	s = pr_string_temp[pr_string_tempindex];
-	pr_string_tempindex = (pr_string_tempindex + 1) % STRINGTEMP_BUFFERS;
-	return s;
+	char string[STRINGTEMP_LENGTH];
+	if (developer.integer)
+	{
+		PF_VarString(0, string, sizeof(string));
+		Con_Print(string);
+	}
 }
 
 void PF_ftos (void)
@@ -1070,8 +1090,10 @@ void PF_ftos (void)
 	v = G_FLOAT(OFS_PARM0);
 
 	s = PR_GetTempString();
-	// LordHavoc: ftos improvement
-	sprintf (s, "%g", v);
+	if ((float)((int)v) == v)
+		sprintf(s, "%i", (int)v);
+	else
+		sprintf(s, "%f", v);
 	G_INT(OFS_RETURN) = PR_SetString(s);
 }
 
@@ -1113,9 +1135,12 @@ void PF_Remove (void)
 
 	ed = G_EDICT(OFS_PARM0);
 	if (ed == sv.edicts)
-		Host_Error("remove: tried to remove world\n");
-	if (NUM_FOR_EDICT(ed) <= MAX_SCOREBOARD)
-		Host_Error("remove: tried to remove a client\n");
+		PF_WARNING("remove: tried to remove world\n");
+	if (NUM_FOR_EDICT(ed) <= svs.maxclients)
+		PF_WARNING("remove: tried to remove a client\n");
+	// LordHavoc: not an error because id1 progs did this in some cases (killtarget removes entities, even if they are already removed in some cases...)
+	if (ed->e->free && developer.integer)
+		PF_WARNING("remove: tried to remove an entity that was already removed\n");
 	ED_Free (ed);
 }
 
@@ -1252,10 +1277,67 @@ void PF_findchainfloat (void)
 	RETURN_EDICT(chain);
 }
 
+// LordHavoc: search for flags in float fields
+void PF_findflags (void)
+{
+	int		e;
+	int		f;
+	int		s;
+	edict_t	*ed;
+
+	e = G_EDICTNUM(OFS_PARM0);
+	f = G_INT(OFS_PARM1);
+	s = (int)G_FLOAT(OFS_PARM2);
+
+	for (e++ ; e < sv.num_edicts ; e++)
+	{
+		pr_xfunction->builtinsprofile++;
+		ed = EDICT_NUM(e);
+		if (ed->e->free)
+			continue;
+		if ((int)E_FLOAT(ed,f) & s)
+		{
+			RETURN_EDICT(ed);
+			return;
+		}
+	}
+
+	RETURN_EDICT(sv.edicts);
+}
+
+// LordHavoc: chained search for flags in float fields
+void PF_findchainflags (void)
+{
+	int		i;
+	int		f;
+	int		s;
+	edict_t	*ent, *chain;
+
+	chain = (edict_t *)sv.edicts;
+
+	f = G_INT(OFS_PARM0);
+	s = (int)G_FLOAT(OFS_PARM1);
+
+	ent = NEXT_EDICT(sv.edicts);
+	for (i = 1;i < sv.num_edicts;i++, ent = NEXT_EDICT(ent))
+	{
+		pr_xfunction->builtinsprofile++;
+		if (ent->e->free)
+			continue;
+		if (!((int)E_FLOAT(ent,f) & s))
+			continue;
+
+		ent->v->chain = EDICT_TO_PROG(chain);
+		chain = ent;
+	}
+
+	RETURN_EDICT(chain);
+}
+
 void PR_CheckEmptyString (char *s)
 {
 	if (s[0] <= ' ')
-		Host_Error ("Bad string");
+		PF_ERROR("Bad string");
 }
 
 void PF_precache_file (void)
@@ -1267,15 +1349,16 @@ void PF_precache_sound (void)
 {
 	char	*s;
 	int		i;
+	int		limit = (sv.protocol == PROTOCOL_QUAKE ? 256 : MAX_SOUNDS);
 
 	if (sv.state != ss_loading)
-		Host_Error ("PF_Precache_*: Precache can only be done in spawn functions");
+		PF_ERROR("PF_Precache_*: Precache can only be done in spawn functions");
 
 	s = G_STRING(OFS_PARM0);
 	G_INT(OFS_RETURN) = G_INT(OFS_PARM0);
 	PR_CheckEmptyString (s);
 
-	for (i=0 ; i<MAX_SOUNDS ; i++)
+	for (i=0 ; i<limit ; i++)
 	{
 		if (!sv.sound_precache[i])
 		{
@@ -1285,16 +1368,17 @@ void PF_precache_sound (void)
 		if (!strcmp(sv.sound_precache[i], s))
 			return;
 	}
-	Host_Error ("PF_precache_sound: overflow");
+	PF_ERROR("PF_precache_sound: overflow");
 }
 
 void PF_precache_model (void)
 {
 	char	*s;
 	int		i;
+	int		limit = (sv.protocol == PROTOCOL_QUAKE ? 256 : MAX_MODELS);
 
 	if (sv.state != ss_loading)
-		Host_Error ("PF_Precache_*: Precache can only be done in spawn functions");
+		PF_ERROR("PF_Precache_*: Precache can only be done in spawn functions");
 
 	s = G_STRING(OFS_PARM0);
 	if (sv.worldmodel->brush.ishlbsp && ((!s) || (!s[0])))
@@ -1302,7 +1386,7 @@ void PF_precache_model (void)
 	G_INT(OFS_RETURN) = G_INT(OFS_PARM0);
 	PR_CheckEmptyString (s);
 
-	for (i=0 ; i<MAX_MODELS ; i++)
+	for (i = 0;i < limit;i++)
 	{
 		if (!sv.model_precache[i])
 		{
@@ -1313,7 +1397,7 @@ void PF_precache_model (void)
 		if (!strcmp(sv.model_precache[i], s))
 			return;
 	}
-	Host_Error ("PF_precache_model: overflow");
+	PF_ERROR("PF_precache_model: overflow");
 }
 
 
@@ -1352,15 +1436,19 @@ void PF_walkmove (void)
 	mfunction_t	*oldf;
 	int 	oldself;
 
+	// assume failure if it returns early
+	G_FLOAT(OFS_RETURN) = 0;
+	
 	ent = PROG_TO_EDICT(pr_global_struct->self);
+	if (ent == sv.edicts)
+		PF_WARNING("walkmove: can not modify world entity\n");
+	if (ent->e->free)
+		PF_WARNING("walkmove: can not modify free entity\n");
 	yaw = G_FLOAT(OFS_PARM0);
 	dist = G_FLOAT(OFS_PARM1);
 
 	if ( !( (int)ent->v->flags & (FL_ONGROUND|FL_FLY|FL_SWIM) ) )
-	{
-		G_FLOAT(OFS_RETURN) = 0;
 		return;
-	}
 
 	yaw = yaw*M_PI*2 / 360;
 
@@ -1393,16 +1481,21 @@ void PF_droptofloor (void)
 	vec3_t		end;
 	trace_t		trace;
 
+	// assume failure if it returns early
+	G_FLOAT(OFS_RETURN) = 0;
+
 	ent = PROG_TO_EDICT(pr_global_struct->self);
+	if (ent == sv.edicts)
+		PF_WARNING("droptofloor: can not modify world entity\n");
+	if (ent->e->free)
+		PF_WARNING("droptofloor: can not modify free entity\n");
 
 	VectorCopy (ent->v->origin, end);
 	end[2] -= 256;
 
 	trace = SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, ent);
 
-	if (trace.fraction == 1)
-		G_FLOAT(OFS_RETURN) = 0;
-	else
+	if (trace.fraction != 1)
 	{
 		VectorCopy (trace.endpos, ent->v->origin);
 		SV_LinkEdict (ent, false);
@@ -1438,9 +1531,9 @@ void PF_lightstyle (void)
 	if (sv.state != ss_active)
 		return;
 
-	for (j = 0;j < MAX_SCOREBOARD;j++)
+	for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++)
 	{
-		if ((client = svs.connectedclients[j]))
+		if (client->netconnection)
 		{
 			MSG_WriteChar (&client->message, svc_lightstyle);
 			MSG_WriteChar (&client->message,style);
@@ -1485,7 +1578,7 @@ PF_pointcontents
 */
 void PF_pointcontents (void)
 {
-	G_FLOAT(OFS_RETURN) = SV_PointContents(G_VECTOR(OFS_PARM0));
+	G_FLOAT(OFS_RETURN) = SV_PointQ1Contents(G_VECTOR(OFS_PARM0));
 }
 
 /*
@@ -1536,7 +1629,14 @@ void PF_aim (void)
 	float	dist, bestdist;
 	float	speed;
 
+	// assume failure if it returns early
+	VectorClear(G_VECTOR(OFS_RETURN));
+
 	ent = G_EDICT(OFS_PARM0);
+	if (ent == sv.edicts)
+		PF_WARNING("aim: can not use world entity\n");
+	if (ent->e->free)
+		PF_WARNING("aim: can not use free entity\n");
 	speed = G_FLOAT(OFS_PARM1);
 
 	VectorCopy (ent->v->origin, start);
@@ -1613,6 +1713,10 @@ void PF_changeyaw (void)
 	float		ideal, current, move, speed;
 
 	ent = PROG_TO_EDICT(pr_global_struct->self);
+	if (ent == sv.edicts)
+		PF_WARNING("changeyaw: can not modify world entity\n");
+	if (ent->e->free)
+		PF_WARNING("changeyaw: can not modify free entity\n");
 	current = ANGLEMOD(ent->v->angles[1]);
 	ideal = ent->v->ideal_yaw;
 	speed = ent->v->yaw_speed;
@@ -1656,19 +1760,23 @@ void PF_changepitch (void)
 	eval_t		*val;
 
 	ent = G_EDICT(OFS_PARM0);
+	if (ent == sv.edicts)
+		PF_WARNING("changepitch: can not modify world entity\n");
+	if (ent->e->free)
+		PF_WARNING("changepitch: can not modify free entity\n");
 	current = ANGLEMOD( ent->v->angles[0] );
 	if ((val = GETEDICTFIELDVALUE(ent, eval_idealpitch)))
 		ideal = val->_float;
 	else
 	{
-		Host_Error ("PF_changepitch: .float idealpitch and .float pitch_speed must be defined to use changepitch");
+		PF_WARNING("PF_changepitch: .float idealpitch and .float pitch_speed must be defined to use changepitch\n");
 		return;
 	}
 	if ((val = GETEDICTFIELDVALUE(ent, eval_pitch_speed)))
 		speed = val->_float;
 	else
 	{
-		Host_Error ("PF_changepitch: .float idealpitch and .float pitch_speed must be defined to use changepitch");
+		PF_WARNING("PF_changepitch: .float idealpitch and .float pitch_speed must be defined to use changepitch\n");
 		return;
 	}
 
@@ -1727,9 +1835,9 @@ sizebuf_t *WriteDest (void)
 	case MSG_ONE:
 		ent = PROG_TO_EDICT(pr_global_struct->msg_entity);
 		entnum = NUM_FOR_EDICT(ent);
-		if (entnum < 1 || entnum > MAX_SCOREBOARD || svs.connectedclients[entnum-1] == NULL)
-			Host_Error("WriteDest: not a client");
-		return &svs.connectedclients[entnum-1]->message;
+		if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
+			Host_Error("WriteDest: tried to write to non-client\n");
+		return &svs.clients[entnum-1].message;
 
 	case MSG_ALL:
 		return &sv.reliable_datagram;
@@ -1738,7 +1846,7 @@ sizebuf_t *WriteDest (void)
 		return &sv.signon;
 
 	default:
-		Host_Error ("WriteDest: bad destination");
+		Host_Error("WriteDest: bad destination");
 		break;
 	}
 
@@ -1767,12 +1875,12 @@ void PF_WriteLong (void)
 
 void PF_WriteAngle (void)
 {
-	MSG_WriteAngle (WriteDest(), G_FLOAT(OFS_PARM1));
+	MSG_WriteAngle (WriteDest(), G_FLOAT(OFS_PARM1), sv.protocol);
 }
 
 void PF_WriteCoord (void)
 {
-	MSG_WriteDPCoord (WriteDest(), G_FLOAT(OFS_PARM1));
+	MSG_WriteCoord (WriteDest(), G_FLOAT(OFS_PARM1), sv.protocol);
 }
 
 void PF_WriteString (void)
@@ -1794,6 +1902,10 @@ void PF_makestatic (void)
 	int i, large;
 
 	ent = G_EDICT(OFS_PARM0);
+	if (ent == sv.edicts)
+		PF_WARNING("makestatic: can not modify world entity\n");
+	if (ent->e->free)
+		PF_WARNING("makestatic: can not modify free entity\n");
 
 	large = false;
 	if (ent->v->modelindex >= 256 || ent->v->frame >= 256)
@@ -1816,8 +1928,8 @@ void PF_makestatic (void)
 	MSG_WriteByte (&sv.signon, ent->v->skin);
 	for (i=0 ; i<3 ; i++)
 	{
-		MSG_WriteDPCoord(&sv.signon, ent->v->origin[i]);
-		MSG_WriteAngle(&sv.signon, ent->v->angles[i]);
+		MSG_WriteCoord(&sv.signon, ent->v->origin[i], sv.protocol);
+		MSG_WriteAngle(&sv.signon, ent->v->angles[i], sv.protocol);
 	}
 
 // throw the entity away now
@@ -1839,11 +1951,14 @@ void PF_setspawnparms (void)
 
 	ent = G_EDICT(OFS_PARM0);
 	i = NUM_FOR_EDICT(ent);
-	if (i < 1 || i > MAX_SCOREBOARD || !svs.connectedclients[i-1])
-		Host_Error ("Entity is not a client");
+	if (i < 1 || i > svs.maxclients || !svs.clients[i-1].active)
+	{
+		Con_Print("tried to setspawnparms on a non-client\n");
+		return;
+	}
 
 	// copy spawn parms out of the client_t
-	client = svs.connectedclients[i-1];
+	client = svs.clients + i-1;
 	for (i=0 ; i< NUM_SPAWN_PARMS ; i++)
 		(&pr_global_struct->parm1)[i] = client->spawn_parms[i];
 }
@@ -1928,17 +2043,13 @@ void PF_GetLight (void)
 	VectorMA(ambientcolor, 0.5, diffusecolor, G_VECTOR(OFS_RETURN));
 }
 
-#define MAX_QC_CVARS 128
-cvar_t qc_cvar[MAX_QC_CVARS];
-int currentqc_cvar;
-
 void PF_registercvar (void)
 {
 	char *name, *value;
-	cvar_t *variable;
 	name = G_STRING(OFS_PARM0);
 	value = G_STRING(OFS_PARM1);
 	G_FLOAT(OFS_RETURN) = 0;
+
 // first check to see if it has already been defined
 	if (Cvar_FindVar (name))
 		return;
@@ -1946,22 +2057,12 @@ void PF_registercvar (void)
 // check for overlap with a command
 	if (Cmd_Exists (name))
 	{
-		Con_Printf ("PF_registercvar: %s is a command\n", name);
+		Con_Printf("PF_registercvar: %s is a command\n", name);
 		return;
 	}
 
-	if (currentqc_cvar >= MAX_QC_CVARS)
-		Host_Error ("PF_registercvar: ran out of cvar slots (%i)\n", MAX_QC_CVARS);
-
-// copy the name and value
-	variable = &qc_cvar[currentqc_cvar++];
-	variable->name = Z_Malloc (strlen(name)+1);
-	strcpy (variable->name, name);
-	variable->string = Z_Malloc (strlen(value)+1);
-	strcpy (variable->string, value);
-	variable->value = atof (value);
+	Cvar_Get(name, value, 0);
 
-	Cvar_RegisterVariable(variable);
 	G_FLOAT(OFS_RETURN) = 1; // success
 }
 
@@ -1989,7 +2090,10 @@ void PF_min (void)
 		G_FLOAT(OFS_RETURN) = f;
 	}
 	else
-		Host_Error("min: must supply at least 2 floats\n");
+	{
+		G_FLOAT(OFS_RETURN) = 0;
+		PF_WARNING("min: must supply at least 2 floats\n");
+	}
 }
 
 /*
@@ -2016,7 +2120,10 @@ void PF_max (void)
 		G_FLOAT(OFS_RETURN) = f;
 	}
 	else
-		Host_Error("max: must supply at least 2 floats\n");
+	{
+		G_FLOAT(OFS_RETURN) = 0;
+		PF_WARNING("max: must supply at least 2 floats\n");
+	}
 }
 
 /*
@@ -2060,7 +2167,15 @@ void PF_copyentity (void)
 {
 	edict_t *in, *out;
 	in = G_EDICT(OFS_PARM0);
+	if (in == sv.edicts)
+		PF_WARNING("copyentity: can not read world entity\n");
+	if (in->e->free)
+		PF_WARNING("copyentity: can not read free entity\n");
 	out = G_EDICT(OFS_PARM1);
+	if (out == sv.edicts)
+		PF_WARNING("copyentity: can not modify world entity\n");
+	if (out->e->free)
+		PF_WARNING("copyentity: can not modify free entity\n");
 	memcpy(out->v, in->v, progs->entityfields * 4);
 }
 
@@ -2082,12 +2197,13 @@ void PF_setcolor (void)
 	entnum = G_EDICTNUM(OFS_PARM0);
 	i = G_FLOAT(OFS_PARM1);
 
-	if (entnum < 1 || entnum > MAX_SCOREBOARD || !(client = svs.connectedclients[entnum-1]))
+	if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active)
 	{
-		Con_Printf ("tried to setcolor a non-client\n");
+		Con_Print("tried to setcolor a non-client\n");
 		return;
 	}
 
+	client = svs.clients + entnum-1;
 	if ((val = GETEDICTFIELDVALUE(client->edict, eval_clientcolors)))
 		val->_float = i;
 	client->colors = i;
@@ -2108,12 +2224,16 @@ effect(origin, modelname, startframe, framecount, framerate)
 */
 void PF_effect (void)
 {
+	int i;
 	char *s;
 	s = G_STRING(OFS_PARM1);
 	if (!s || !s[0])
-		Host_Error("effect: no model specified\n");
+		PF_WARNING("effect: no model specified\n");
 
-	SV_StartEffect(G_VECTOR(OFS_PARM0), SV_ModelIndex(s), G_FLOAT(OFS_PARM2), G_FLOAT(OFS_PARM3), G_FLOAT(OFS_PARM4));
+	i = SV_ModelIndex(s);
+	if (i < 0)
+		PF_WARNING("effect: model not precached\n");
+	SV_StartEffect(G_VECTOR(OFS_PARM0), i, G_FLOAT(OFS_PARM2), G_FLOAT(OFS_PARM3), G_FLOAT(OFS_PARM4));
 }
 
 void PF_te_blood (void)
@@ -2123,9 +2243,9 @@ void PF_te_blood (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_BLOOD);
 	// origin
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 	// velocity
 	MSG_WriteByte(&sv.datagram, bound(-128, (int) G_VECTOR(OFS_PARM1)[0], 127));
 	MSG_WriteByte(&sv.datagram, bound(-128, (int) G_VECTOR(OFS_PARM1)[1], 127));
@@ -2141,15 +2261,15 @@ void PF_te_bloodshower (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_BLOODSHOWER);
 	// min
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 	// max
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2], sv.protocol);
 	// speed
-	MSG_WriteDPCoord(&sv.datagram, G_FLOAT(OFS_PARM2));
+	MSG_WriteCoord(&sv.datagram, G_FLOAT(OFS_PARM2), sv.protocol);
 	// count
 	MSG_WriteShort(&sv.datagram, bound(0, G_FLOAT(OFS_PARM3), 65535));
 }
@@ -2159,9 +2279,9 @@ void PF_te_explosionrgb (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_EXPLOSIONRGB);
 	// origin
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 	// color
 	MSG_WriteByte(&sv.datagram, bound(0, (int) (G_VECTOR(OFS_PARM1)[0] * 255), 255));
 	MSG_WriteByte(&sv.datagram, bound(0, (int) (G_VECTOR(OFS_PARM1)[1] * 255), 255));
@@ -2175,17 +2295,17 @@ void PF_te_particlecube (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_PARTICLECUBE);
 	// min
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 	// max
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2], sv.protocol);
 	// velocity
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2], sv.protocol);
 	// count
 	MSG_WriteShort(&sv.datagram, bound(0, G_FLOAT(OFS_PARM3), 65535));
 	// color
@@ -2193,7 +2313,7 @@ void PF_te_particlecube (void)
 	// gravity true/false
 	MSG_WriteByte(&sv.datagram, ((int) G_FLOAT(OFS_PARM5)) != 0);
 	// randomvel
-	MSG_WriteDPCoord(&sv.datagram, G_FLOAT(OFS_PARM6));
+	MSG_WriteCoord(&sv.datagram, G_FLOAT(OFS_PARM6), sv.protocol);
 }
 
 void PF_te_particlerain (void)
@@ -2203,17 +2323,17 @@ void PF_te_particlerain (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_PARTICLERAIN);
 	// min
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 	// max
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2], sv.protocol);
 	// velocity
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2], sv.protocol);
 	// count
 	MSG_WriteShort(&sv.datagram, bound(0, G_FLOAT(OFS_PARM3), 65535));
 	// color
@@ -2227,17 +2347,17 @@ void PF_te_particlesnow (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_PARTICLESNOW);
 	// min
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 	// max
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2], sv.protocol);
 	// velocity
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2], sv.protocol);
 	// count
 	MSG_WriteShort(&sv.datagram, bound(0, G_FLOAT(OFS_PARM3), 65535));
 	// color
@@ -2251,9 +2371,9 @@ void PF_te_spark (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_SPARK);
 	// origin
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 	// velocity
 	MSG_WriteByte(&sv.datagram, bound(-128, (int) G_VECTOR(OFS_PARM1)[0], 127));
 	MSG_WriteByte(&sv.datagram, bound(-128, (int) G_VECTOR(OFS_PARM1)[1], 127));
@@ -2267,9 +2387,9 @@ void PF_te_gunshotquad (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_GUNSHOTQUAD);
 	// origin
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 }
 
 void PF_te_spikequad (void)
@@ -2277,9 +2397,9 @@ void PF_te_spikequad (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_SPIKEQUAD);
 	// origin
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 }
 
 void PF_te_superspikequad (void)
@@ -2287,9 +2407,9 @@ void PF_te_superspikequad (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_SUPERSPIKEQUAD);
 	// origin
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 }
 
 void PF_te_explosionquad (void)
@@ -2297,9 +2417,9 @@ void PF_te_explosionquad (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_EXPLOSIONQUAD);
 	// origin
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 }
 
 void PF_te_smallflash (void)
@@ -2307,9 +2427,9 @@ void PF_te_smallflash (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_SMALLFLASH);
 	// origin
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 }
 
 void PF_te_customflash (void)
@@ -2319,9 +2439,9 @@ void PF_te_customflash (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_CUSTOMFLASH);
 	// origin
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 	// radius
 	MSG_WriteByte(&sv.datagram, bound(0, G_FLOAT(OFS_PARM1) / 8 - 1, 255));
 	// lifetime
@@ -2337,9 +2457,9 @@ void PF_te_gunshot (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_GUNSHOT);
 	// origin
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 }
 
 void PF_te_spike (void)
@@ -2347,9 +2467,9 @@ void PF_te_spike (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_SPIKE);
 	// origin
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 }
 
 void PF_te_superspike (void)
@@ -2357,9 +2477,9 @@ void PF_te_superspike (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_SUPERSPIKE);
 	// origin
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 }
 
 void PF_te_explosion (void)
@@ -2367,9 +2487,9 @@ void PF_te_explosion (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_EXPLOSION);
 	// origin
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 }
 
 void PF_te_tarexplosion (void)
@@ -2377,9 +2497,9 @@ void PF_te_tarexplosion (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_TAREXPLOSION);
 	// origin
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 }
 
 void PF_te_wizspike (void)
@@ -2387,9 +2507,9 @@ void PF_te_wizspike (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_WIZSPIKE);
 	// origin
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 }
 
 void PF_te_knightspike (void)
@@ -2397,9 +2517,9 @@ void PF_te_knightspike (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_KNIGHTSPIKE);
 	// origin
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 }
 
 void PF_te_lavasplash (void)
@@ -2407,9 +2527,9 @@ void PF_te_lavasplash (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_LAVASPLASH);
 	// origin
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 }
 
 void PF_te_teleport (void)
@@ -2417,9 +2537,9 @@ void PF_te_teleport (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_TELEPORT);
 	// origin
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 }
 
 void PF_te_explosion2 (void)
@@ -2427,11 +2547,12 @@ void PF_te_explosion2 (void)
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_EXPLOSION2);
 	// origin
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 	// color
 	MSG_WriteByte(&sv.datagram, G_FLOAT(OFS_PARM1));
+	MSG_WriteByte(&sv.datagram, G_FLOAT(OFS_PARM2));
 }
 
 void PF_te_lightning1 (void)
@@ -2441,13 +2562,13 @@ void PF_te_lightning1 (void)
 	// owner entity
 	MSG_WriteShort(&sv.datagram, G_EDICTNUM(OFS_PARM0));
 	// start
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2], sv.protocol);
 	// end
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2], sv.protocol);
 }
 
 void PF_te_lightning2 (void)
@@ -2457,13 +2578,13 @@ void PF_te_lightning2 (void)
 	// owner entity
 	MSG_WriteShort(&sv.datagram, G_EDICTNUM(OFS_PARM0));
 	// start
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2], sv.protocol);
 	// end
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2], sv.protocol);
 }
 
 void PF_te_lightning3 (void)
@@ -2473,13 +2594,13 @@ void PF_te_lightning3 (void)
 	// owner entity
 	MSG_WriteShort(&sv.datagram, G_EDICTNUM(OFS_PARM0));
 	// start
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2], sv.protocol);
 	// end
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2], sv.protocol);
 }
 
 void PF_te_beam (void)
@@ -2489,22 +2610,22 @@ void PF_te_beam (void)
 	// owner entity
 	MSG_WriteShort(&sv.datagram, G_EDICTNUM(OFS_PARM0));
 	// start
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2], sv.protocol);
 	// end
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2], sv.protocol);
 }
 
 void PF_te_plasmaburn (void)
 {
 	MSG_WriteByte(&sv.datagram, svc_temp_entity);
 	MSG_WriteByte(&sv.datagram, TE_PLASMABURN);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]);
-	MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1], sv.protocol);
+	MSG_WriteCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2], sv.protocol);
 }
 
 static void clippointtosurface(msurface_t *surf, vec3_t p, vec3_t out)
@@ -2542,11 +2663,9 @@ static msurface_t *getsurface(edict_t *ed, int surfnum)
 	if (modelindex < 1 || modelindex >= MAX_MODELS)
 		return NULL;
 	model = sv.models[modelindex];
-	if (model->type != mod_brush)
-		return NULL;
-	if (surfnum < 0 || surfnum >= model->brushq1.nummodelsurfaces)
+	if (surfnum < 0 || surfnum >= model->nummodelsurfaces)
 		return NULL;
-	return model->brushq1.surfaces + surfnum + model->brushq1.firstmodelsurface;
+	return model->brushq1.surfaces + surfnum + model->firstmodelsurface;
 }
 
 
@@ -2623,16 +2742,16 @@ void PF_getsurfacenearpoint(void)
 	if (modelindex < 1 || modelindex >= MAX_MODELS)
 		return;
 	model = sv.models[modelindex];
-	if (model->type != mod_brush)
+	if (!model->brushq1.numsurfaces)
 		return;
 
 	// FIXME: implement rotation/scaling
 	VectorSubtract(point, ed->v->origin, p);
 	best = -1;
 	bestdist = 1000000000;
-	for (surfnum = 0;surfnum < model->brushq1.nummodelsurfaces;surfnum++)
+	for (surfnum = 0;surfnum < model->nummodelsurfaces;surfnum++)
 	{
-		surf = model->brushq1.surfaces + surfnum + model->brushq1.firstmodelsurface;
+		surf = model->brushq1.surfaces + surfnum + model->firstmodelsurface;
 		dist = PlaneDiff(p, surf->plane);
 		dist = dist * dist;
 		if (dist < bestdist)
@@ -2691,14 +2810,15 @@ void PR_Files_CloseAll(void)
 //float(string s) stof = #81; // get numerical value from a string
 void PF_stof(void)
 {
-	char *s = PF_VarString(0);
-	G_FLOAT(OFS_RETURN) = atof(s);
+	char string[STRINGTEMP_LENGTH];
+	PF_VarString(0, string, sizeof(string));
+	G_FLOAT(OFS_RETURN) = atof(string);
 }
 
 //float(string filename, float mode) fopen = #110; // opens a file inside quake/gamedir/data/ (mode is FILE_READ, FILE_APPEND, or FILE_WRITE), returns fhandle >= 0 if successful, or fhandle < 0 if unable to open file for any reason
 void PF_fopen(void)
 {
-	int filenum, mode;
+	int filenum, mode, i;
 	char *modestring, *filename;
 	for (filenum = 0;filenum < MAX_PRFILES;filenum++)
 		if (pr_files[filenum] == NULL)
@@ -2727,17 +2847,26 @@ void PF_fopen(void)
 		return;
 	}
 	filename = G_STRING(OFS_PARM0);
-	// .. is parent directory on many platforms
-	// / is parent directory on Amiga
+	// control characters do not cause issues with any platforms I know of, but they are usually annoying to deal with
+	// ../ is parent directory on many platforms
+	// // is parent directory on Amiga
+	// / at the beginning of a path is root on unix, and parent directory on Amiga
 	// : is root of drive on Amiga (also used as a directory separator on Mac, but / works there too, so that's a bad idea)
 	// \ is a windows-ism (so it's naughty to use it, / works on all platforms)
-	if ((filename[0] == '.' && filename[1] == '.') || filename[0] == '/' || strrchr(filename, ':') || strrchr(filename, '\\'))
+	for (i = 0;filename[i];i++)
 	{
-		Con_Printf("PF_fopen: dangerous or non-portable filename \"%s\" not allowed. (contains : or \\ or begins with .. or /)\n", filename);
-		G_FLOAT(OFS_RETURN) = -4;
-		return;
+		if (filename[i] < ' ' || (filename[i] == '/' && filename[i+1] == '/') || (filename[i] == '.' && filename[i+1] == '.') || filename[i] == ':' || filename[i] == '\\' || filename[0] == '/')
+		{
+			Con_Printf("PF_fopen: dangerous/confusing/annoying/non-portable filename \"%s\" not allowed. (contains control characters or // or .. or : or \\ or begins with /)\n", filename);
+			G_FLOAT(OFS_RETURN) = -4;
+			return;
+		}
 	}
 	pr_files[filenum] = FS_Open(va("data/%s", filename), modestring, false);
+
+	if (pr_files[filenum] == NULL && modestring == "rb")
+		pr_files[filenum] = FS_Open(filename, modestring, false);
+
 	if (pr_files[filenum] == NULL)
 		G_FLOAT(OFS_RETURN) = -1;
 	else
@@ -2766,7 +2895,7 @@ void PF_fclose(void)
 void PF_fgets(void)
 {
 	int c, end;
-	static char string[MAX_VARSTRING];
+	static char string[STRINGTEMP_LENGTH];
 	int filenum = G_FLOAT(OFS_PARM0);
 	if (filenum < 0 || filenum >= MAX_PRFILES)
 	{
@@ -2784,7 +2913,7 @@ void PF_fgets(void)
 		c = FS_Getc(pr_files[filenum]);
 		if (c == '\r' || c == '\n' || c < 0)
 			break;
-		if (end < MAX_VARSTRING - 1)
+		if (end < STRINGTEMP_LENGTH - 1)
 			string[end++] = c;
 	}
 	string[end] = 0;
@@ -2793,7 +2922,7 @@ void PF_fgets(void)
 		c = FS_Getc(pr_files[filenum]);
 	if (developer.integer)
 		Con_Printf("fgets: %s\n", string);
-	if (c >= 0)
+	if (c >= 0 || end)
 		G_INT(OFS_RETURN) = PR_SetString(string);
 	else
 		G_INT(OFS_RETURN) = 0;
@@ -2803,7 +2932,7 @@ void PF_fgets(void)
 void PF_fputs(void)
 {
 	int stringlength;
-	char *s = PF_VarString(1);
+	char string[STRINGTEMP_LENGTH];
 	int filenum = G_FLOAT(OFS_PARM0);
 	if (filenum < 0 || filenum >= MAX_PRFILES)
 	{
@@ -2815,10 +2944,11 @@ void PF_fputs(void)
 		Con_Printf("PF_fputs: no such file handle %i (or file has been closed)\n", filenum);
 		return;
 	}
-	if ((stringlength = strlen(s)))
-		FS_Write(pr_files[filenum], s, stringlength);
+	PF_VarString(1, string, sizeof(string));
+	if ((stringlength = strlen(string)))
+		FS_Write(pr_files[filenum], string, stringlength);
 	if (developer.integer)
-		Con_Printf("fputs: %s\n", s);
+		Con_Printf("fputs: %s\n", string);
 }
 
 //float(string s) strlen = #114; // returns how many characters are in a string
@@ -2835,7 +2965,8 @@ void PF_strlen(void)
 //string(string s1, string s2) strcat = #115; // concatenates two strings (for example "abc", "def" would return "abcdef") and returns as a tempstring
 void PF_strcat(void)
 {
-	char *s = PF_VarString(0);
+	char *s = PR_GetTempString();
+	PF_VarString(0, s, STRINGTEMP_LENGTH);
 	G_INT(OFS_RETURN) = PR_SetString(s);
 }
 
@@ -2859,7 +2990,9 @@ void PF_substring(void)
 //vector(string s) stov = #117; // returns vector value from a string
 void PF_stov(void)
 {
-	Math_atov(PF_VarString(0), G_VECTOR(OFS_RETURN));
+	char string[STRINGTEMP_LENGTH];
+	PF_VarString(0, string, sizeof(string));
+	Math_atov(string, G_VECTOR(OFS_RETURN));
 }
 
 //string(string s) strzone = #118; // makes a copy of a string into the string zone and returns it, this is often used to keep around a tempstring for longer periods of time (tempstrings are replaced often)
@@ -2887,41 +3020,40 @@ void PF_clientcommand (void)
 
 	//find client for this entity
 	i = (NUM_FOR_EDICT(G_EDICT(OFS_PARM0)) - 1);
-	if (i < 0 || i >= MAX_SCOREBOARD || !svs.connectedclients[i])
-		Host_Error("PF_clientcommand: entity is not a client");
+	if (i < 0 || i >= svs.maxclients || !svs.clients[i].active)
+	{
+		Con_Print("PF_clientcommand: entity is not a client\n");
+		return;
+	}
 
 	temp_client = host_client;
-	host_client = svs.connectedclients[i];
+	host_client = svs.clients + i;
 	Cmd_ExecuteString (G_STRING(OFS_PARM1), src_client);
 	host_client = temp_client;
 }
 
 //float(string s) tokenize = #441; // takes apart a string into individal words (access them with argv), returns how many
 //this function originally written by KrimZon, made shorter by LordHavoc
-char **tokens = NULL;
-int    max_tokens, num_tokens = 0;
+//20040203: rewritten by LordHavoc (no longer uses allocations)
+int num_tokens = 0;
+char *tokens[256], tokenbuf[4096];
 void PF_tokenize (void)
 {
+	int pos;
 	const char *p;
-	char *str;
-	str = G_STRING(OFS_PARM0);
+	p = G_STRING(OFS_PARM0);
 
-	if (tokens != NULL)
+	num_tokens = 0;
+	pos = 0;
+	while(COM_ParseToken(&p, false))
 	{
-		int i;
-		for (i=0;i<num_tokens;i++)
-			Z_Free(tokens[i]);
-		Z_Free(tokens);
-		num_tokens = 0;
-	}
-
-	tokens = Z_Malloc(strlen(str) * sizeof(char *));
-	max_tokens = strlen(str);
-
-	for (p = str;COM_ParseToken(&p, false) && num_tokens < max_tokens;num_tokens++)
-	{
-		tokens[num_tokens] = Z_Malloc(strlen(com_token) + 1);
-		strcpy(tokens[num_tokens], com_token);
+		if (num_tokens >= (int)(sizeof(tokens)/sizeof(tokens[0])))
+			break;
+		if (pos + strlen(com_token) + 1 > sizeof(tokenbuf))
+			break;
+		tokens[num_tokens++] = tokenbuf + pos;
+		strcpy(tokenbuf + pos, com_token);
+		pos += strlen(com_token) + 1;
 	}
 
 	G_FLOAT(OFS_RETURN) = num_tokens;
@@ -2948,6 +3080,11 @@ void PF_setattachment (void)
 	int i, modelindex;
 	model_t *model;
 
+	if (e == sv.edicts)
+		PF_WARNING("setattachment: can not modify world entity\n");
+	if (e->e->free)
+		PF_WARNING("setattachment: can not modify free entity\n");
+
 	if (tagentity == NULL)
 		tagentity = sv.edicts;
 
@@ -2961,13 +3098,13 @@ void PF_setattachment (void)
 	if (tagentity != NULL && tagentity != sv.edicts && tagname && tagname[0])
 	{
 		modelindex = (int)tagentity->v->modelindex;
-		if (modelindex >= 0 && modelindex < MAX_MODELS)
+		if (modelindex >= 0 && modelindex < MAX_MODELS && (model = sv.models[modelindex]))
 		{
-			model = sv.models[modelindex];
 			if (model->data_overridetagnamesforskin && (unsigned int)tagentity->v->skin < (unsigned int)model->numskins && model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames)
 				for (i = 0;i < model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames;i++)
 					if (!strcmp(tagname, model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].data_overridetagnames[i].name))
 						v->_float = i + 1;
+			// FIXME: use a model function to get tag info (need to handle skeletal)
 			if (v->_float == 0 && model->alias.aliasnum_tags)
 				for (i = 0;i < model->alias.aliasnum_tags;i++)
 					if (!strcmp(tagname, model->alias.aliasdata_tags[i].name))
@@ -2981,6 +3118,178 @@ void PF_setattachment (void)
 }
 
 
+/////////////////////////////////////////
+// DP_QC_FS_SEARCH extension
+
+// qc fs search handling
+#define MAX_SEARCHES 128
+
+fssearch_t *pr_fssearchlist[MAX_SEARCHES];
+
+void PR_Search_Init(void)
+{
+	memset(pr_fssearchlist,0,sizeof(pr_fssearchlist));
+}
+
+void PR_Search_Reset(void)
+{
+	int i;
+	// reset the fssearch list
+	for(i = 0; i < MAX_SEARCHES; i++)
+		if(pr_fssearchlist[i])
+			FS_FreeSearch(pr_fssearchlist[i]);
+	memset(pr_fssearchlist,0,sizeof(pr_fssearchlist));
+}
+
+/*
+=========
+PF_search_begin
+
+float search_begin(string pattern, float caseinsensitive, float quiet)
+=========
+*/
+void PF_search_begin(void)
+{
+	int handle;
+	char *pattern;
+	int caseinsens, quiet;
+
+	pattern = G_STRING(OFS_PARM0);
+
+	PR_CheckEmptyString(pattern);
+
+	caseinsens = G_FLOAT(OFS_PARM1);
+	quiet = G_FLOAT(OFS_PARM2);
+	
+	for(handle = 0; handle < MAX_SEARCHES; handle++)
+		if(!pr_fssearchlist[handle])
+			break;
+
+	if(handle >= MAX_SEARCHES)
+	{
+		Con_Printf("PR_search_begin: ran out of search handles (%i)\n", MAX_SEARCHES);
+		G_FLOAT(OFS_RETURN) = -2;
+		return;
+	}
+
+	if(!(pr_fssearchlist[handle] = FS_Search(pattern,caseinsens, quiet)))
+		G_FLOAT(OFS_RETURN) = -1;
+	else
+		G_FLOAT(OFS_RETURN) = handle;
+}
+
+/*
+=========
+VM_search_end
+
+void	search_end(float handle)
+=========
+*/
+void PF_search_end(void)
+{
+	int handle;
+
+	handle = G_FLOAT(OFS_PARM0);
+	
+	if(handle < 0 || handle >= MAX_SEARCHES)
+	{
+		Con_Printf("PF_search_end: invalid handle %i\n", handle);
+		return;
+	}
+	if(pr_fssearchlist[handle] == NULL)
+	{
+		Con_Printf("PF_search_end: no such handle %i\n", handle);
+		return;
+	}
+
+	FS_FreeSearch(pr_fssearchlist[handle]);
+	pr_fssearchlist[handle] = NULL;
+}
+
+/*
+=========
+VM_search_getsize
+
+float	search_getsize(float handle)
+=========
+*/
+void PF_search_getsize(void)
+{
+	int handle;
+
+	handle = G_FLOAT(OFS_PARM0);
+
+	if(handle < 0 || handle >= MAX_SEARCHES)
+	{
+		Con_Printf("PF_search_getsize: invalid handle %i\n", handle);
+		return;
+	}
+	if(pr_fssearchlist[handle] == NULL)
+	{
+		Con_Printf("PF_search_getsize: no such handle %i\n", handle);
+		return;
+	}
+	
+	G_FLOAT(OFS_RETURN) = pr_fssearchlist[handle]->numfilenames;
+}
+
+/*
+=========
+VM_search_getfilename
+
+string	search_getfilename(float handle, float num)
+=========
+*/
+void PF_search_getfilename(void)
+{
+	int handle, filenum;
+	char *tmp;
+
+	handle = G_FLOAT(OFS_PARM0);
+	filenum = G_FLOAT(OFS_PARM1);
+
+	if(handle < 0 || handle >= MAX_SEARCHES)
+	{
+		Con_Printf("PF_search_getfilename: invalid handle %i\n", handle);
+		return;
+	}
+	if(pr_fssearchlist[handle] == NULL)
+	{
+		Con_Printf("PF_search_getfilename: no such handle %i\n", handle);
+		return;
+	}
+	if(filenum < 0 || filenum >= pr_fssearchlist[handle]->numfilenames)
+	{
+		Con_Printf("PF_search_getfilename: invalid filenum %i\n", filenum);
+		return;
+	}
+	
+	tmp = PR_GetTempString();
+	strcpy(tmp, pr_fssearchlist[handle]->filenames[filenum]);
+
+	G_INT(OFS_RETURN) = PR_SetString(tmp);
+}
+
+void PF_cvar_string (void)
+{
+	char *str;
+	cvar_t *var;
+	char *tmp;
+
+	str = G_STRING(OFS_PARM0);
+	var = Cvar_FindVar (str);
+	if (var)
+	{
+		tmp = PR_GetTempString();
+		strcpy(tmp, var->string);
+	}
+	else
+		tmp = "";
+	G_INT(OFS_RETURN) = PR_SetString(tmp);
+}
+
+
+
 builtin_t pr_builtin[] =
 {
 NULL,						// #0
@@ -3134,7 +3443,7 @@ PF_te_wizspike,				// #423 void(vector org) te_wizspike (DP_TE_STANDARDEFFECTBUI
 PF_te_knightspike,			// #424 void(vector org) te_knightspike (DP_TE_STANDARDEFFECTBUILTINS)
 PF_te_lavasplash,			// #425 void(vector org) te_lavasplash (DP_TE_STANDARDEFFECTBUILTINS)
 PF_te_teleport,				// #426 void(vector org) te_teleport (DP_TE_STANDARDEFFECTBUILTINS)
-PF_te_explosion2,			// #427 void(vector org, float color) te_explosion2 (DP_TE_STANDARDEFFECTBUILTINS)
+PF_te_explosion2,			// #427 void(vector org, float colorstart, float colorlength) te_explosion2 (DP_TE_STANDARDEFFECTBUILTINS)
 PF_te_lightning1,			// #428 void(entity own, vector start, vector end) te_lightning1 (DP_TE_STANDARDEFFECTBUILTINS)
 PF_te_lightning2,			// #429 void(entity own, vector start, vector end) te_lightning2 (DP_TE_STANDARDEFFECTBUILTINS)
 PF_te_lightning3,			// #430 void(entity own, vector start, vector end) te_lightning3 (DP_TE_STANDARDEFFECTBUILTINS)
@@ -3151,13 +3460,23 @@ PF_clientcommand,			// #440 void(entity e, string s) clientcommand (KRIMZON_SV_P
 PF_tokenize,				// #441 float(string s) tokenize (KRIMZON_SV_PARSECLIENTCOMMAND)
 PF_argv,					// #442 string(float n) argv (KRIMZON_SV_PARSECLIENTCOMMAND)
 PF_setattachment,			// #443 void(entity e, entity tagentity, string tagname) setattachment (DP_GFX_QUAKE3MODELTAGS)
-NULL,						// #444
-NULL,						// #445
-NULL,						// #446
-NULL,						// #447
-NULL,						// #448
-NULL,						// #449
-a a a a a					// #450-499 (LordHavoc)
+PF_search_begin,			// #444
+PF_search_end,				// #445
+PF_search_getsize,			// #446
+PF_search_getfilename,		// #447
+PF_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)
+NULL,						// #451
+NULL,						// #452
+NULL,						// #453
+NULL,						// #454
+NULL,						// #455
+NULL,						// #456
+NULL,						// #457
+NULL,						// #458
+NULL,						// #459
+a a a a						// #460-499 (LordHavoc)
 };
 
 builtin_t *pr_builtins = pr_builtin;
@@ -3165,13 +3484,15 @@ int pr_numbuiltins = sizeof(pr_builtin)/sizeof(pr_builtin[0]);
 
 void PR_Cmd_Init(void)
 {
-	pr_strings_mempool = Mem_AllocPool("pr_stringszone");
+	pr_strings_mempool = Mem_AllocPool("pr_stringszone", 0, NULL);
 	PR_Files_Init();
+	PR_Search_Init();
 }
 
 void PR_Cmd_Reset(void)
 {
 	Mem_EmptyPool(pr_strings_mempool);
+	PR_Search_Reset();
 	PR_Files_CloseAll();
 }