From 988282b03e2a96c7fbfc8df45761dbf559f864be Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sat, 26 Nov 2011 17:59:44 +0100 Subject: [PATCH] g_spawn_useallspawns - disable teamplay spawn rules --- defaultXonotic.cfg | 4 ++-- qcsrc/server/autocvars.qh | 1 + qcsrc/server/cl_client.qc | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) 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) { -- 2.39.2