From 9e8120cc98c47749912b3ba481efc1bd51e4a61f Mon Sep 17 00:00:00 2001 From: Greyscale Date: Mon, 8 Jun 2009 16:04:11 -0700 Subject: [PATCH] Fixed bug where disabling weapons disabling all knockback. Also fixed potential error when disabling hitgroups. --- src/zr/knockback.inc | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/zr/knockback.inc b/src/zr/knockback.inc index be3144c..3f9be69 100644 --- a/src/zr/knockback.inc +++ b/src/zr/knockback.inc @@ -71,23 +71,25 @@ KnockbackOnClientHurt(client, attacker, const String:weapon[], hitgroup, dmg_hea } new bool:weapons = GetConVarBool(g_hCvarsList[CVAR_WEAPONS]); - if (!weapons) + if (weapons) { - return; + new weaponindex = WeaponsNameToIndex(weapon); + if (weaponindex != -1) + { + // Apply weapon knockback multiplier. + knockback *= WeaponsGetKnockback(weaponindex); + } } - new weaponindex = WeaponsNameToIndex(weapon); - if (weaponindex != -1) + new bool:hitgroups = GetConVarBool(g_hCvarsList[CVAR_HITGROUPS]); + if (hitgroups) { - // Apply weapon knockback multiplier. - knockback *= WeaponsGetKnockback(weaponindex); - } - - new hitgroupindex = HitgroupToIndex(hitgroup); - if (hitgroupindex != -1) - { - // Apply hitgroup knockback multiplier. - knockback *= HitgroupsGetKnockback(hitgroupindex); + new hitgroupindex = HitgroupToIndex(hitgroup); + if (hitgroupindex != -1) + { + // Apply hitgroup knockback multiplier. + knockback *= HitgroupsGetKnockback(hitgroupindex); + } } // Apply damage knockback multiplier.