From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 31 Mar 2012 11:08:09 +0000 (+0200)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.7.0~111^2~31
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=6592a0bad06897e1365877198acac7d23e35776f;hp=40cc357c2c4732d3d035240cfab34b9097f51f34;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 0ec01d582..89edddfe0 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1343,7 +1343,7 @@ set con_completion_vnextmap	map
 set con_completion_vdomap	map
 set con_completion_playermodel	models/player/*.iqm
 
-// these non-saved engine cvars shall be savedG
+// these non-saved engine cvars shall be saved
 seta cl_port $cl_port
 seta r_showsurfaces $r_showsurfaces
 seta r_ambient $r_ambient
@@ -1355,6 +1355,7 @@ seta vid_gl20 $vid_gl20
 seta vid_gl13 $vid_gl13
 seta r_drawviewmodel $r_drawviewmodel
 seta v_idlescale $v_idlescale
+seta net_slist_queriespersecond $net_slist_queriespersecond
 
 // ticrate
 //sys_ticrate 0.0166667
@@ -1594,10 +1595,10 @@ alias cl_hook_gamestart_kh
 alias cl_hook_gamestart_ons
 alias cl_hook_gamestart_as
 alias cl_hook_gamestart_rc
-alias cl_hook_gamestart_nexball
+alias cl_hook_gamestart_nb
 alias cl_hook_gamestart_cts
 alias cl_hook_gamestart_ka
-alias cl_hook_gamestart_freezetag
+alias cl_hook_gamestart_ft
 alias cl_hook_gameend
 alias cl_hook_activeweapon
 
@@ -1616,10 +1617,10 @@ alias sv_hook_gamestart_kh
 alias sv_hook_gamestart_ons
 alias sv_hook_gamestart_as
 alias sv_hook_gamestart_rc
-alias sv_hook_gamestart_nexball
+alias sv_hook_gamestart_nb
 alias sv_hook_gamestart_cts
 alias sv_hook_gamestart_ka
-alias sv_hook_gamestart_freezetag
+alias sv_hook_gamestart_ft
 alias sv_hook_gamerestart
 alias sv_hook_gameend
 
diff --git a/qcsrc/common/util-pre.qh b/qcsrc/common/util-pre.qh
index 518a5698d..b65193d44 100644
--- a/qcsrc/common/util-pre.qh
+++ b/qcsrc/common/util-pre.qh
@@ -6,4 +6,6 @@
 //# define COMPAT_XON010_CHANNELS
 # define COMPAT_XON050_ENGINE
 # define COMPAT_NO_MOD_IS_XONOTIC
+# define COMPAT_XON060_DONTCRASH_CHECKPVS
 #endif
+
diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 5a1627423..334474966 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -979,7 +979,7 @@ float Say(entity source, float teamsay, entity privatesay, string msgin, float f
 	if(source.classname != "player")
 	{
 		if not(intermission_running)
-			if(teamsay || (autocvar_g_chat_nospectators == 1) || (autocvar_g_chat_nospectators == 2 && !inWarmupStage))
+			if(teamsay || (autocvar_g_chat_nospectators == 1) || (autocvar_g_chat_nospectators == 2 && !(inWarmupStage || gameover)))
 				teamsay = -1; // spectators
 	}
 
diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index 4cd4f1156..1e4356400 100644
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -191,7 +191,7 @@ void VoteCount(float first_count)
 	vote_accept_count = vote_reject_count = vote_abstain_count = 0;
 	
 	float spectators_allowed = ((autocvar_sv_vote_nospectators != 2) 
-				|| ((autocvar_sv_vote_nospectators == 1) && inWarmupStage) 
+				|| ((autocvar_sv_vote_nospectators == 1) && (inWarmupStage || gameover))
 				|| (autocvar_sv_vote_nospectators == 0));
 				
 	float vote_player_count, is_player, notvoters;
@@ -997,4 +997,4 @@ void VoteCommand(float request, entity caller, float argc, string vote_command)
 			return;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/qcsrc/warpzonelib/client.qc b/qcsrc/warpzonelib/client.qc
index 84bfe7b96..6f7561234 100644
--- a/qcsrc/warpzonelib/client.qc
+++ b/qcsrc/warpzonelib/client.qc
@@ -2,7 +2,12 @@ void WarpZone_Fade_PreDraw()
 {
 	vector org;
 	org = getpropertyvec(VF_ORIGIN);
-	if(!checkpvs(org, self)) // this makes sense as long as we don't support recursive warpzones
+	if(
+#ifdef COMPAT_XON060_DONTCRASH_CHECKPVS
+		cvar_string("g_xonoticversion") != "0.5.0" &&
+		cvar_string("g_xonoticversion") != "0.6.0" &&
+#endif
+		!checkpvs(org, self)) // this makes sense as long as we don't support recursive warpzones
 		self.alpha = 0;
 	else if(self.warpzone_fadestart)
 		self.alpha = bound(0, (self.warpzone_fadeend - vlen(org - self.origin - 0.5 * (self.mins + self.maxs))) / (self.warpzone_fadeend - self.warpzone_fadestart), 1);