]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix naming of a variable which broke inferno's damage burn time
authorMario <mario@smbclan.net>
Fri, 15 Jan 2016 14:53:18 +0000 (00:53 +1000)
committerMario <mario@smbclan.net>
Fri, 15 Jan 2016 14:53:18 +0000 (00:53 +1000)
qcsrc/common/mutators/mutator/buffs/buffs.qc

index 507041e0603bd4a784fdc64b1e4cb16634a0b56d..f3632cbaf0abb1eff749350429ad9d503de9887d 100644 (file)
@@ -579,7 +579,7 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerDamage_Calculate)
 
        if(frag_attacker.buffs & BUFF_INFERNO.m_itemid)
        if(frag_target != frag_attacker) {
-               float time = buff_Inferno_CalculateTime(
+               float btime = buff_Inferno_CalculateTime(
                        frag_damage,
                        0,
                        autocvar_g_buffs_inferno_burntime_min_time,
@@ -587,7 +587,7 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerDamage_Calculate)
                        autocvar_g_buffs_inferno_burntime_target_time,
                        autocvar_g_buffs_inferno_burntime_factor
                );
-               Fire_AddDamage(frag_target, frag_attacker, (frag_damage * autocvar_g_buffs_inferno_damagemultiplier) * time, time, DEATH_BUFF.m_id);
+               Fire_AddDamage(frag_target, frag_attacker, (frag_damage * autocvar_g_buffs_inferno_damagemultiplier), btime, DEATH_BUFF.m_id);
        }
 
        // this... is ridiculous (TODO: fix!)