From 40c74999ca21245531841e923219525dc717c64b Mon Sep 17 00:00:00 2001 From: fruitiex Date: Sat, 5 Dec 2009 19:32:30 +0000 Subject: [PATCH] cvar for enabling/disabling playerclips on a map (useful on eg defrag maps with "solid startlines") git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8374 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/defaultNexuiz.cfg | 2 ++ data/qcsrc/server/cl_client.qc | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index c483b0977..593c88b57 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -503,6 +503,8 @@ set g_player_alpha 1 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" diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index fe54d2d31..81e4813da 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -824,7 +824,10 @@ void PutClientInServer (void) 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); -- 2.39.2