From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 1 Sep 2010 06:56:03 +0000 (+0200)
Subject: sticky grenades: only stick if hitting world, not if hitting e.g. a lift (then it... 
X-Git-Tag: xonotic-v0.1.0preview~320^2~1
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=9b15ad08198912041190b9bd5d8daeaf84894638;p=xonotic%2Fxonotic-data.pk3dir.git

sticky grenades: only stick if hitting world, not if hitting e.g. a lift (then it shall detonate as before)
---

diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index 64a987047..82a1870af 100644
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -55,7 +55,7 @@ void W_Grenade_Damage (entity inflictor, entity attacker, float damage, float de
 void W_Grenade_Touch1 (void)
 {
 	PROJECTILE_TOUCH;
-	if(cvar("g_balance_grenadelauncher_primary_sticky") && other.takedamage != DAMAGE_AIM)
+	if(cvar("g_balance_grenadelauncher_primary_sticky") && other == world) // && other.takedamage != DAMAGE_AIM)
 	{
 		spamsound (self, CHAN_PROJECTILE, "weapons/grenade_stick.wav", VOL_BASE, ATTN_NORM);
 
@@ -78,7 +78,7 @@ void W_Grenade_Touch1 (void)
 void W_Grenade_Touch2 (void)
 {
 	PROJECTILE_TOUCH;
-	if(cvar("g_balance_grenadelauncher_secondary_sticky") && other.takedamage != DAMAGE_AIM)
+	if(cvar("g_balance_grenadelauncher_secondary_sticky") && other == world) // other.takedamage != DAMAGE_AIM)
 	{
 		spamsound (self, CHAN_PROJECTILE, "weapons/grenade_stick.wav", VOL_BASE, ATTN_NORM);