From: Mario <zacjardine@y7mail.com>
Date: Tue, 10 Feb 2015 00:10:47 +0000 (+1100)
Subject: Use DEATH_WEAPONOF instead of DEATH_WEAPONOFWEAPONDEATH when calculating fire damage... 
X-Git-Tag: xonotic-v0.8.1~18^2~30
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=12f8a07f3e513b41e3d10d10e5387ba2835a2d3d;p=xonotic%2Fxonotic-data.pk3dir.git

Use DEATH_WEAPONOF instead of DEATH_WEAPONOFWEAPONDEATH when calculating fire damage accuracy (incorrectly calls checks fireball accuracy)
---

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;
 	}
 }