r4057 - in trunk/data: . qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Fri Aug 8 08:05:05 EDT 2008


Author: div0
Date: 2008-08-08 08:05:05 -0400 (Fri, 08 Aug 2008)
New Revision: 4057

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
g_spawnpoints_auto_move_out_of_solid cvar


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2008-08-08 11:59:18 UTC (rev 4056)
+++ trunk/data/defaultNexuiz.cfg	2008-08-08 12:05:05 UTC (rev 4057)
@@ -286,6 +286,7 @@
 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

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2008-08-08 11:59:18 UTC (rev 4056)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2008-08-08 12:05:05 UTC (rev 4057)
@@ -228,14 +228,19 @@
 		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"))




More information about the nexuiz-commits mailing list