From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 13 Jun 2011 14:05:44 +0000 (+0200)
Subject: simplify more; allow sticking to shootable buttons
X-Git-Tag: xonotic-v0.5.0~199^2~18^2~3
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=0b3a780591273b576fec3d96c79915ee508322c6

simplify more; allow sticking to shootable buttons
---

diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index 42bf4efa5..b4ecb9b55 100644
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -225,16 +225,10 @@ void W_Mine_Touch (void)
 
 	PROJECTILE_TOUCH;
 
-	if(other && other.takedamage == DAMAGE_AIM)
+	if(other && other.classname == "player" && other.deadflag == DEAD_NO)
 	{
-		// hit some enemy
-		// we do nothing, other than clearing velocity (falling straight down)
-
-		// allow falling down, but no other movement, when hit an enemy
-		self.velocity_x = 0;
-		self.velocity_y = 0;
-		if(self.velocity_z > 0)
-			self.velocity_z = 0;
+		// hit a player
+		// don't stick
 	}
 	else
 	{