From 185b8cd90688d0a75b4dad0faaf9f3c7b710a3a0 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 3 Sep 2010 17:39:14 +0200 Subject: [PATCH] asplode grenades properly when hitting non-bouncable surfaces --- qcsrc/server/w_grenadelauncher.qc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 (); } -- 2.39.2