From: terencehill Date: Sun, 11 Apr 2021 21:41:45 +0000 (+0200) Subject: Fix slow revival progress speed when reviving a player frozen by an ice nade X-Git-Tag: xonotic-v0.8.5~449^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=482e24244ca215aefcadd2a82ae8ee5921db6d7d;p=xonotic%2Fxonotic-data.pk3dir.git Fix slow revival progress speed when reviving a player frozen by an ice nade --- diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc index 599edf926..a75a00804 100644 --- a/qcsrc/common/mutators/mutator/nades/nades.qc +++ b/qcsrc/common/mutators/mutator/nades/nades.qc @@ -1369,6 +1369,8 @@ MUTATOR_HOOKFUNCTION(nades, PlayerPreThink) if (n > 0 && STAT(FROZEN, player) == FROZEN_TEMP_DYING) // OK, there is at least one teammate reviving us { STAT(REVIVE_PROGRESS, player) = bound(0, STAT(REVIVE_PROGRESS, player) + frametime * max(1/60, autocvar_g_freezetag_revive_speed), 1); + // undo what PlayerPreThink did + STAT(REVIVE_PROGRESS, player) = bound(0, STAT(REVIVE_PROGRESS, player) + frametime * player.revive_speed, 1); SetResource(player, RES_HEALTH, max(1, STAT(REVIVE_PROGRESS, player) * start_health)); if(STAT(REVIVE_PROGRESS, player) >= 1)