From c7c9b5a182b1399e2e8301e2f9235a0c03cecfa4 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 17 Jan 2018 13:10:51 +1000 Subject: [PATCH] Don't make monsters affected by player clips by default (separate option exists) --- monsters.cfg | 1 + qcsrc/common/monsters/sv_monsters.qc | 2 +- qcsrc/server/autocvars.qh | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) 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; -- 2.39.2