From 12f8a07f3e513b41e3d10d10e5387ba2835a2d3d Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 10 Feb 2015 11:10:47 +1100 Subject: [PATCH] Use DEATH_WEAPONOF instead of DEATH_WEAPONOFWEAPONDEATH when calculating fire damage accuracy (incorrectly calls checks fireball accuracy) --- qcsrc/server/g_damage.qc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 392cb4ea5..18d58f4eb 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -1138,7 +1138,7 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in RadiusDamage_running = 0; if(!DEATH_ISSPECIAL(deathtype)) - accuracy_add(attacker, DEATH_WEAPONOFWEAPONDEATH(deathtype), 0, min(coredamage, stat_damagedone)); + accuracy_add(attacker, DEATH_WEAPONOF(deathtype), 0, min(coredamage, stat_damagedone)); return total_damage_to_creatures; } @@ -1254,7 +1254,7 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt) } } if(accuracy_isgooddamage(o, e)) - accuracy_add(o, DEATH_WEAPONOFWEAPONDEATH(dt), 0, max(0, totaldamage - mindamage)); + accuracy_add(o, DEATH_WEAPONOF(dt), 0, max(0, totaldamage - mindamage)); return max(0, totaldamage - mindamage); // can never be negative, but to make sure } else @@ -1268,7 +1268,7 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt) e.fire_owner = o; e.fire_hitsound = false; if(accuracy_isgooddamage(o, e)) - accuracy_add(o, DEATH_WEAPONOFWEAPONDEATH(dt), 0, d); + accuracy_add(o, DEATH_WEAPONOF(dt), 0, d); return d; } } -- 2.39.2