Fix nades and clips

diff --git a/qcsrc/client/projectile.qc b/qcsrc/client/projectile.qc
index 9744df8be1f0e32578c2a2d7d3db8e6d8fbffd60..8ff5e0f911627e78be6315aa196989debded3b1c 100644 (file)
--- a/qcsrc/client/projectile.qc
+++ b/qcsrc/client/projectile.qc
@@ -444,6 +444,7 @@ void Ent_Projectile()
                        self.mins = '-16 -16 -16';
                        self.maxs = '16 16 16';
                        self.colormod = Nade_Color(Nade_IDFromProjectile(self.cnt));
+                       self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP | DPCONTENTS_BOTCLIP;
                        self.move_movetype = MOVETYPE_BOUNCE;
                        self.move_touch = func_null;
                        self.scale = 1.5;

diff --git a/qcsrc/server/mutators/mutator_nades.qc b/qcsrc/server/mutators/mutator_nades.qc
index 06f91468f1aa86ee724b6b4c3487c8a173dd5cd1..da75e25ac23679fdaeea6bab190f0bc0311b2d62 100644 (file)
--- a/qcsrc/server/mutators/mutator_nades.qc
+++ b/qcsrc/server/mutators/mutator_nades.qc
@@ -549,6 +549,7 @@ void nade_boom()
 
 void nade_touch()
 {
+       if(trace_dphitcontents & (DPCONTENTS_PLAYERCLIP | DPCONTENTS_MONSTERCLIP)) { return; }
        PROJECTILE_TOUCH;
        //setsize(self, '-2 -2 -2', '2 2 2');
        //UpdateCSQCProjectile(self);