X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=svvm_cmds.c;h=dffc4fda6681cdad0621b4de8cff199a19d0bbd1;hb=71d932a80d050b8b04bcc1e266235034cd91661c;hp=0c7e3907310764fbda8786ff39979671823c1e52;hpb=4ed0394dfb5ec223db2b82a53db57acc442c7fde;p=xonotic%2Fdarkplaces.git

diff --git a/svvm_cmds.c b/svvm_cmds.c
index 0c7e3907..dffc4fda 100644
--- a/svvm_cmds.c
+++ b/svvm_cmds.c
@@ -1,3 +1,5 @@
+#include "quakedef.h"
+
 #include "prvm_cmds.h"
 
 //============================================================================
@@ -142,6 +144,8 @@ char *vm_sv_extensions =
 "DP_SV_CMD "
 "DP_QC_CMD "
 "FTE_STRINGS "
+"DP_CON_BESTWEAPON "
+"DP_QC_STRREPLACE "
 ;
 
 /*
@@ -408,7 +412,7 @@ static void VM_SV_ambientsound (void)
 
 	MSG_WriteVector(&sv.signon, pos, sv.protocol);
 
-	if (large)
+	if (large || sv.protocol == PROTOCOL_NEHAHRABJP || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3)
 		MSG_WriteShort (&sv.signon, soundnum);
 	else
 		MSG_WriteByte (&sv.signon, soundnum);
@@ -696,7 +700,7 @@ static int VM_SV_newcheckclient (int check)
 	VectorAdd(ent->fields.server->origin, ent->fields.server->view_ofs, org);
 	checkpvsbytes = 0;
 	if (sv.worldmodel && sv.worldmodel->brush.FatPVS)
-		checkpvsbytes = sv.worldmodel->brush.FatPVS(sv.worldmodel, org, 0, checkpvs, sizeof(checkpvs));
+		checkpvsbytes = sv.worldmodel->brush.FatPVS(sv.worldmodel, org, 0, checkpvs, sizeof(checkpvs), false);
 
 	return i;
 }
@@ -1282,6 +1286,12 @@ static void VM_SV_makestatic (void)
 		MSG_WriteShort (&sv.signon, (int)ent->fields.server->modelindex);
 		MSG_WriteShort (&sv.signon, (int)ent->fields.server->frame);
 	}
+	else if (sv.protocol == PROTOCOL_NEHAHRABJP || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3)
+	{
+		MSG_WriteByte (&sv.signon,svc_spawnstatic);
+		MSG_WriteShort (&sv.signon, (int)ent->fields.server->modelindex);
+		MSG_WriteByte (&sv.signon, (int)ent->fields.server->frame);
+	}
 	else
 	{
 		MSG_WriteByte (&sv.signon,svc_spawnstatic);
@@ -3209,8 +3219,8 @@ VM_strtolower,					// #480 string(string s) VM_strtolower (DP_QC_STRING_CASE_FUN
 VM_strtoupper,					// #481 string(string s) VM_strtoupper (DP_QC_STRING_CASE_FUNCTIONS)
 VM_cvar_defstring,				// #482 string(string s) cvar_defstring (DP_QC_CVAR_DEFSTRING)
 VM_SV_pointsound,				// #483 void(vector origin, string sample, float volume, float attenuation) (DP_SV_POINTSOUND)
-NULL,							// #484
-NULL,							// #485
+VM_strreplace,					// #484 string(string search, string replace, string subject) strreplace (DP_QC_STRREPLACE)
+VM_strireplace,					// #485 string(string search, string replace, string subject) strireplace (DP_QC_STRREPLACE)
 NULL,							// #486
 NULL,							// #487
 NULL,							// #488