g_spawn_useallspawns - disable teamplay spawn rules

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 27fcf03bfa9cc07831a9f1cb2bb8c74a1f4674fd..0108b783da82e05445bd912e86eb4ad0d2aebc54 100644 (file)
--- 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 e1d64b9aae875fa38273cb05a705e03af8d6b3f4..609516634c3282858329786bc0c7aeabdabcb6e1 100644 (file)
--- 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 47c0c4f0f42db7264501256977f1c465c6b22d67..40039ead81f107743a38a78b3a58be2ea38ba6cd 100644 (file)
--- 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)
        {