]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
attempt: check movetype for this instead, Now it will stick ONLY if MOVETYPE_NONE...
authorRudolf Polzer <divverent@alientrap.org>
Wed, 1 Sep 2010 06:58:41 +0000 (08:58 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 1 Sep 2010 06:58:41 +0000 (08:58 +0200)
qcsrc/server/w_grenadelauncher.qc

index 82a1870afafe8e796476feff76a741af3e57eeb0..b39b3a23de06508fa63e146af38e3c7aa18cfa46 100644 (file)
@@ -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)
+       if(cvar("g_balance_grenadelauncher_primary_sticky") && other == world && 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)
+       if(cvar("g_balance_grenadelauncher_secondary_sticky") && other == world && other.takedamage != DAMAGE_AIM && other.movetype == MOVETYPE_NONE)
        {
                spamsound (self, CHAN_PROJECTILE, "weapons/grenade_stick.wav", VOL_BASE, ATTN_NORM);