From: Samual Date: Wed, 5 Oct 2011 04:28:47 +0000 (-0400) Subject: Fix the exception for hagar W_CheckProjectileDamage function (previously was overridi... X-Git-Tag: xonotic-v0.6.0~40^2~92^2^2 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=6ace8078489e1dca00a78620355a6e00793740b2 Fix the exception for hagar W_CheckProjectileDamage function (previously was overriding with linkexplode even when using primary and such... now it only does if it actually is the proper scenario.) --- diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc index 76d2f9414..7d9db5c39 100644 --- a/qcsrc/server/w_hagar.qc +++ b/qcsrc/server/w_hagar.qc @@ -26,8 +26,13 @@ void W_Hagar_Damage (entity inflictor, entity attacker, float damage, float deat return; float is_linkexplode = ((inflictor.realowner == self.realowner) - && ((inflictor.projectiledeathtype & HITTYPE_SECONDARY) && (self.projectiledeathtype & HITTYPE_SECONDARY)) - && autocvar_g_balance_hagar_secondary_load_linkexplode); + && (inflictor.projectiledeathtype & HITTYPE_SECONDARY) + && (self.projectiledeathtype & HITTYPE_SECONDARY)); + + if(is_linkexplode) + is_linkexplode = (is_linkexplode && autocvar_g_balance_hagar_secondary_load_linkexplode); + else + is_linkexplode = -1; // not secondary load, so continue as normal without exception. if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, is_linkexplode)) return; // g_projectiles_damage says to halt