From 75db5cf91cf6fb42ae6472d2ba3f6f714b59863c Mon Sep 17 00:00:00 2001 From: Samual Date: Wed, 26 Oct 2011 12:14:28 -0400 Subject: [PATCH] Bring back the debug prints -- working on fixing a bug with hagar secondary's "is_linkexplode" exception system for projectile damage check --- qcsrc/server/w_common.qc | 2 +- qcsrc/server/w_hagar.qc | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/qcsrc/server/w_common.qc b/qcsrc/server/w_common.qc index 1a995191c2..45b5545dd1 100644 --- a/qcsrc/server/w_common.qc +++ b/qcsrc/server/w_common.qc @@ -542,7 +542,7 @@ float W_CheckProjectileDamage(entity inflictor, entity projowner, float deathtyp float is_from_owner = (inflictor == projowner); float is_from_exception = (exception != -1); - //print(strcat("from_contents ", ftos(is_from_contents), " : from_owner ", ftos(is_from_owner), " : exception ", strcat(ftos(is_from_exception), " (", ftos(exception), "). \n"))); + print(strcat("from_contents ", ftos(is_from_contents), " : from_owner ", ftos(is_from_owner), " : exception ", strcat(ftos(is_from_exception), " (", ftos(exception), "). \n"))); if(autocvar_g_projectiles_damage <= -2) { diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc index e6467e4549..aa0dcdcd6e 100644 --- a/qcsrc/server/w_hagar.qc +++ b/qcsrc/server/w_hagar.qc @@ -25,15 +25,24 @@ void W_Hagar_Damage (entity inflictor, entity attacker, float damage, float deat if (self.health <= 0) return; - float is_linkexplode = ((inflictor.realowner == self.realowner) + float is_linkexplode = ((inflictor.owner == self.owner) && (inflictor.projectiledeathtype & HITTYPE_SECONDARY) && (self.projectiledeathtype & HITTYPE_SECONDARY)); + + /* + float is_linkexplode = ( ( ((inflictor.realowner == self.realowner) + && (inflictor.projectiledeathtype & HITTYPE_SECONDARY)) + || (deathtype == DEATH_SLIME || deathtype == DEATH_LAVA) ) + && (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. + print(strcat("is_linkexplode: ", ftos(is_linkexplode), ", inflict_owner_classname: ", inflictor.owner.classname, ", self_owner_classname: ", self.owner.classname, ". \n")); + if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, is_linkexplode)) return; // g_projectiles_damage says to halt -- 2.39.2