From: TimePath <andrew.hardaker1995@gmail.com>
Date: Tue, 10 Feb 2015 10:08:30 +0000 (+1100)
Subject: Tweak the Inferno burn time formula for correctness
X-Git-Tag: xonotic-v0.8.1~18^2~25
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=63b6093a517be3ebbcf0bc5a7c0ff96639493699;p=xonotic%2Fxonotic-data.pk3dir.git

Tweak the Inferno burn time formula for correctness
---

diff --git a/qcsrc/server/mutators/mutator_buffs.qc b/qcsrc/server/mutators/mutator_buffs.qc
index 9ab079ce9..0a74d7f39 100644
--- a/qcsrc/server/mutators/mutator_buffs.qc
+++ b/qcsrc/server/mutators/mutator_buffs.qc
@@ -375,8 +375,7 @@ void buff_Vengeance_DelayedDamage()
 
 float buff_Inferno_CalculateTime(float x, float offset_x, float offset_y, float intersect_x, float intersect_y, float base)
 {
-	float f = (x - offset_x) / intersect_x;
-	return offset_y + (intersect_y - offset_y) * logn((base - 1) * (f + 1), base);
+	return offset_y + (intersect_y - offset_y) * logn(((x - offset_x) * ((base - 1) / intersect_x)) + 1, base);
 }
 
 MUTATOR_HOOKFUNCTION(buffs_PlayerDamage_Calculate)