From: Rudolf Polzer <divverent@xonotic.org>
Date: Sat, 26 Nov 2011 16:59:44 +0000 (+0100)
Subject: g_spawn_useallspawns - disable teamplay spawn rules
X-Git-Tag: xonotic-v0.6.0~35^2~33^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=988282b03e2a96c7fbfc8df45761dbf559f864be;p=xonotic%2Fxonotic-data.pk3dir.git

g_spawn_useallspawns - disable teamplay spawn rules
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 27fcf03bf..0108b783d 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -607,8 +607,8 @@ seta g_freezetag_revive_clearspeed 1.6 "Speed at which reviving progress gets lo
 seta g_freezetag_revive_extra_size 100 "Distance in qu that you can stand from a frozen teammate to keep reviving him"
 seta g_freezetag_frozen_force 0.6 "How much to multiply the force on a frozen player with"
 
-// 50% of the spawns shall be far away from any players
-set g_spawn_furthest 0.5
+set g_spawn_furthest 0.5 "this amount of the spawns shall be far away from any players"
+set g_spawn_useallspawns 0 "use all spawns, e.g. also team spawns in non-teamplay, and all spawns, even enemy spawns, in teamplay"
 // respawn delay
 set g_respawn_delay 2 "number of seconds you have to wait before you can respawn again"
 set g_respawn_waves 0 "respawn in waves (every n seconds), intended to decrease overwhelming base attacks"
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index e1d64b9aa..609516634 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -965,6 +965,7 @@ float autocvar_g_shootfromeye;
 string autocvar_g_shootfromfixedorigin;
 float autocvar_g_showweaponspawns;
 float autocvar_g_spawn_furthest;
+float autocvar_g_spawn_useallspawns;
 float autocvar_g_spawnpoints_auto_move_out_of_solid;
 #define autocvar_g_spawnshieldtime cvar("g_spawnshieldtime")
 float autocvar_g_spawnsound;
diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 47c0c4f0f..40039ead8 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -329,7 +329,7 @@ entity SelectSpawnPoint (float anypoint)
 	if (spot)
 		return spot;
 
-	if(anypoint)
+	if(anypoint || autocvar_g_spawn_useallspawns)
 		teamcheck = -1;
 	else if(have_team_spawns > 0)
 	{