[nexuiz-commits] r8374 - in trunk/data: . qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat Dec 5 14:32:30 EST 2009


Author: fruitiex
Date: 2009-12-05 14:32:30 -0500 (Sat, 05 Dec 2009)
New Revision: 8374

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/cl_client.qc
Log:
cvar for enabling/disabling playerclips on a map (useful on eg defrag maps with "solid startlines")


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-12-05 15:46:53 UTC (rev 8373)
+++ trunk/data/defaultNexuiz.cfg	2009-12-05 19:32:30 UTC (rev 8374)
@@ -503,6 +503,8 @@
 set g_player_brightness 0	"set to 2 for brighter players"
 seta g_balance_cloaked_alpha 0.25
 
+set g_playerclip_collisions 1 "0 = disable collision testing against playerclips, might be useful on some defrag maps"
+
 set welcome_message_time 8
 
 alias clearmap "disconnect"

Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-12-05 15:46:53 UTC (rev 8373)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-12-05 19:32:30 UTC (rev 8374)
@@ -824,7 +824,10 @@
 		self.iscreature = TRUE;
 		self.movetype = MOVETYPE_WALK;
 		self.solid = SOLID_SLIDEBOX;
-		self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP;
+		if(cvar("g_playerclip_collisions"))
+			self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP;
+		else
+			self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY;
 		self.frags = FRAGS_PLAYER;
 		if(independent_players)
 			MAKE_INDEPENDENT_PLAYER(self);



More information about the nexuiz-commits mailing list