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

diff --git a/monsters.cfg b/monsters.cfg
index cafefbed7963014243d1b07ab3085b436968cdef..054bd8a0cb425f5cff5ec8d54b456255fcf14d47 100644 (file)
--- 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 cdb3e8e6428341103abeadc96e7fa6613d360a5d..527827c3913e0653f4b7d63c43940cc4a298e34a 100644 (file)
--- 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 b71d4459d1387469f9c1732fa906dda15617f965..eb7487acb46b1424191e7b1d92b4b1a976c77391 100644 (file)
--- 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;