Merge remote-tracking branch 'origin/master' into samual/spawn_weapons

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_damage.qc

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 4174bbc42c7c74bf09efbec835dbb9e6743f0916..710c7d4e2a88e7e7fa5ca4fdeb019c5e84ab5d96 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -1286,9 +1286,9 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt)
 
                        // LEMMA:
                        // Look at:
-                       // totaldamage = min(mindamage + d, maxdamage * maxdps)
+                       // totaldamage = min(mindamage + d, maxtime * maxdps)
                        // We see:
-                       // totaldamage <= maxdamage * maxdps
+                       // totaldamage <= maxtime * maxdps
                        // ==> totaldamage / maxdps <= maxtime.
                        // We also see:
                        // totaldamage / mindps = min(mindamage / mindps + d, maxtime * maxdps / mindps)