From: Mario <zacjardine@y7mail.com>
Date: Thu, 13 Nov 2014 16:28:55 +0000 (+1100)
Subject: Fix nades and clips
X-Git-Tag: xonotic-v0.8.0~162^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e607064b2f7f75640e82f9359ba5acc2e19fa95c;p=xonotic%2Fxonotic-data.pk3dir.git

Fix nades and clips
---

diff --git a/qcsrc/client/projectile.qc b/qcsrc/client/projectile.qc
index 9744df8be..8ff5e0f91 100644
--- 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 06f91468f..da75e25ac 100644
--- 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);