From a941857dde7bb7f89f2180af64cef782e20a943c Mon Sep 17 00:00:00 2001 From: div0 Date: Fri, 8 Aug 2008 12:05:05 +0000 Subject: [PATCH] g_spawnpoints_auto_move_out_of_solid cvar git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4057 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/defaultNexuiz.cfg | 1 + data/qcsrc/server/miscfunctions.qc | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index 9af2c0fe3..df90f8abf 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -286,6 +286,7 @@ set g_midair_shieldtime 0.3 set g_spawnshieldtime 0 set g_spawnsound 1 set g_spawnpoints_autodrop 0 +set g_spawnpoints_auto_move_out_of_solid 0 set g_forced_respawn 0 set g_fullbrightplayers 0 set g_fullbrightitems 0 diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index 233da6ad6..70bc15dfd 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -228,14 +228,19 @@ void relocate_spawnpoint() self.mins = PL_MIN; self.maxs = PL_MAX; move_out_of_solid(self); + if(cvar("g_spawnpoints_auto_move_out_of_solid")) + print("\{1}"); // chat beep, and put the error in the chat area print("^1NOTE: this map needs FIXING. Spawnpoint at ", vtos(o - '0 0 1')); print(" needs to be moved out of solid, e.g. by '", ftos(self.origin_x - o_x)); print(" ", ftos(self.origin_y - o_y)); print(" ", ftos(self.origin_z - o_z), "'\n"); - self.origin = o; - self.mins = self.maxs = '0 0 0'; - objerror("player spawn point in solid, mapper sucks!\n"); - return; + if(!cvar("g_spawnpoints_auto_move_out_of_solid")) + { + self.origin = o; + self.mins = self.maxs = '0 0 0'; + objerror("player spawn point in solid, mapper sucks!\n"); + return; + } } if(cvar("g_spawnpoints_autodrop")) -- 2.39.2