Fix nades and clips
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 16:28:55 +0000 (03:28 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 16:28:55 +0000 (03:28 +1100)
qcsrc/client/projectile.qc
qcsrc/server/mutators/mutator_nades.qc

index 9744df8..8ff5e0f 100644 (file)
@@ -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;
index 06f9146..da75e25 100644 (file)
@@ -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);