X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_main.c;h=63dd5a81d7767e23814306232899d9243184ce02;hp=e72a0565302b9daf549f1ecef111fbc1babb15f4;hb=e88a73794afa1f0fe65fc70d318f4e288cabc0d1;hpb=22cb365eac64641816ec25c81fbacceb7bc655fa

diff --git a/sv_main.c b/sv_main.c
index e72a0565..63dd5a81 100644
--- a/sv_main.c
+++ b/sv_main.c
@@ -25,7 +25,7 @@ void SV_VM_Init();
 void SV_VM_Setup();
 
 // select which protocol to host, this is fed to Protocol_EnumForName
-cvar_t sv_protocolname = {0, "sv_protocolname", "DP6"};
+cvar_t sv_protocolname = {0, "sv_protocolname", "DP7"};
 cvar_t sv_ratelimitlocalplayer = {0, "sv_ratelimitlocalplayer", "0"};
 cvar_t sv_maxrate = {CVAR_SAVE | CVAR_NOTIFY, "sv_maxrate", "10000"};
 
@@ -408,6 +408,8 @@ void SV_ConnectClient (int clientnum, netconn_t *netconnection)
 	else
 	{
 		// call the progs to get default spawn parms for the new client
+		// set self to world to intentionally cause errors with broken SetNewParms code in some mods
+		prog->globals.server->self = 0;
 		PRVM_ExecuteProgram (prog->globals.server->SetNewParms, "QC function SetNewParms is missing");
 		for (i=0 ; i<NUM_SPAWN_PARMS ; i++)
 			client->spawn_parms[i] = (&prog->globals.server->parm1)[i];
@@ -1946,6 +1948,7 @@ qboolean SV_VM_CB_LoadEdict(prvm_edict_t *ent)
 	return true;
 }
 
+cvar_t	pr_checkextension = {CVAR_READONLY, "pr_checkextension", "1"};
 cvar_t	nomonsters = {0, "nomonsters", "0"};
 cvar_t	gamecfg = {0, "gamecfg", "0"};
 cvar_t	scratch1 = {0, "scratch1", "0"};
@@ -1972,6 +1975,7 @@ cvar_t	cutscene = {0, "cutscene", "1"};
 
 void SV_VM_Init(void)
 {
+	Cvar_RegisterVariable (&pr_checkextension);
 	Cvar_RegisterVariable (&nomonsters);
 	Cvar_RegisterVariable (&gamecfg);
 	Cvar_RegisterVariable (&scratch1);
@@ -2205,7 +2209,7 @@ void SV_VM_Setup(void)
 	prog->load_edict = SV_VM_CB_LoadEdict;
 	prog->init_cmd = VM_SV_Cmd_Init;
 	prog->reset_cmd = VM_SV_Cmd_Reset;
-	prog->error_cmd = NULL; // change this
+	prog->error_cmd = Host_Error;
 
 	// TODO: add a requiredfuncs list (ask LH if this is necessary at all)
 	PRVM_LoadProgs( sv_progs.string, 0, NULL, REQFIELDS, reqfields );