From: terencehill Date: Tue, 25 Sep 2018 12:48:35 +0000 (+0200) Subject: Use FROZEN_* constants in all the Freeze calls X-Git-Tag: xonotic-v0.8.5~1827^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F600%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git Use FROZEN_* constants in all the Freeze calls --- diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc index d740bd0b9..7980399f6 100644 --- a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc +++ b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc @@ -203,7 +203,7 @@ void freezetag_Freeze(entity targ, entity attacker) if(autocvar_g_freezetag_frozen_maxtime > 0) targ.freezetag_frozen_timeout = time + autocvar_g_freezetag_frozen_maxtime; - Freeze(targ, 0, 1, true); + Freeze(targ, 0, FROZEN_NORMAL, true); freezetag_count_alive_players(); diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc index 45a6bae97..93a45fb3d 100644 --- a/qcsrc/common/mutators/mutator/nades/nades.qc +++ b/qcsrc/common/mutators/mutator/nades/nades.qc @@ -383,7 +383,7 @@ void nade_ice_freeze(entity freezefield, entity frost_target, float freezetime) { frost_target.frozen_by = freezefield.realowner; Send_Effect(EFFECT_ELECTRO_IMPACT, frost_target.origin, '0 0 0', 1); - Freeze(frost_target, 1 / freezetime, 3, false); + Freeze(frost_target, 1 / freezetime, FROZEN_TEMP_DYING, false); Drop_Special_Items(frost_target); }