From: Rudolf Polzer <divVerent@alientrap.org>
Date: Fri, 3 Sep 2010 15:39:14 +0000 (+0200)
Subject: asplode grenades properly when hitting non-bouncable surfaces
X-Git-Tag: xonotic-v0.1.0preview~317^2~9^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=185b8cd90688d0a75b4dad0faaf9f3c7b710a3a0;p=xonotic%2Fxonotic-data.pk3dir.git

asplode grenades properly when hitting non-bouncable surfaces
---

diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index b39b3a23d..33a6ca5aa 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 == world && other.takedamage != DAMAGE_AIM && other.movetype == MOVETYPE_NONE)
+	if(cvar("g_balance_grenadelauncher_primary_sticky") && other.takedamage != DAMAGE_AIM && other.movetype == MOVETYPE_NONE)
 	{
 		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 == world && other.takedamage != DAMAGE_AIM && other.movetype == MOVETYPE_NONE)
+	if(cvar("g_balance_grenadelauncher_secondary_sticky") && other.takedamage != DAMAGE_AIM && other.movetype == MOVETYPE_NONE)
 	{
 		spamsound (self, CHAN_PROJECTILE, "weapons/grenade_stick.wav", VOL_BASE, ATTN_NORM);
 
@@ -96,7 +96,7 @@ void W_Grenade_Touch2 (void)
 	}
 	else
 	{
-		if (other.takedamage == DAMAGE_AIM)
+		if (cvar("g_balance_grenadelauncher_secondary_sticky") || other.takedamage == DAMAGE_AIM)
 		{
 			self.use ();
 		}