From: Mario <mario@smbclan.net>
Date: Wed, 17 Jan 2018 03:10:51 +0000 (+1000)
Subject: Don't make monsters affected by player clips by default (separate option exists)
X-Git-Tag: xonotic-v0.8.5~7^2~1^2~70
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c7c9b5a182b1399e2e8301e2f9235a0c03cecfa4;p=xonotic%2Fxonotic-data.pk3dir.git

Don't make monsters affected by player clips by default (separate option exists)
---

diff --git a/monsters.cfg b/monsters.cfg
index cafefbed79..054bd8a0cb 100644
--- a/monsters.cfg
+++ b/monsters.cfg
@@ -96,6 +96,7 @@ set g_monsters_drop_time 10
 set g_monsters_ignoretraces 1
 set g_monsters_lineofsight 1
 set g_monsters_owners 1
+set g_monsters_playerclip_collisions 0
 set g_monsters_teams 1
 set g_monsters_score_kill 0
 set g_monsters_score_spawned 0
diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index cdb3e8e642..527827c391 100644
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -1394,7 +1394,7 @@ bool Monster_Spawn(entity this, bool check_appear, int mon_id)
 	if(autocvar_g_nodepthtestplayers) { this.effects |= EF_NODEPTHTEST; }
 	if(mon.spawnflags & MONSTER_TYPE_SWIM) { this.flags |= FL_SWIM; }
 
-	if(autocvar_g_playerclip_collisions)
+	if(autocvar_g_monsters_playerclip_collisions)
 		this.dphitcontentsmask |= DPCONTENTS_PLAYERCLIP;
 
 	if(mon.spawnflags & MONSTER_TYPE_FLY)
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index b71d4459d1..eb7487acb4 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -400,6 +400,7 @@ int autocvar_g_monsters_score_kill;
 int autocvar_g_monsters_score_spawned;
 bool autocvar_g_monsters_typefrag;
 bool autocvar_g_monsters_owners;
+bool autocvar_g_monsters_playerclip_collisions;
 float autocvar_g_monsters_miniboss_chance;
 float autocvar_g_monsters_miniboss_healthboost;
 float autocvar_g_monsters_drop_time;