From 7a7315c6bd4da93263ccb09b09613c84fc611e4b Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 12 Feb 2025 20:04:08 +1000 Subject: [PATCH] Remove a now unnecessary frozen check in CTF code --- qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc | 1 - qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc index d1040754c..63ed0e436 100644 --- a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc +++ b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc @@ -1142,7 +1142,6 @@ METHOD(Flag, giveTo, bool(Flag this, entity flag, entity toucher)) // special touch behaviors // TODO: mutator hook to prevent picking up objectives if(IS_INDEPENDENT_PLAYER(toucher)) { return; } - else if(STAT(FROZEN, toucher)) { return; } else if(IS_VEHICLE(toucher)) { if(autocvar_g_ctf_allow_vehicle_touch && toucher.owner) diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc index 70a7f27bc..46a518c86 100644 --- a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc +++ b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc @@ -273,7 +273,7 @@ void freezetag_Unfreeze(entity targ, bool reset_health) targ.pauseregen_finished = time + autocvar_g_balance_pause_health_regen; - STAT(FROZEN, targ) = 0; + STAT(FROZEN, targ) = false; STAT(REVIVE_PROGRESS, targ) = 0; targ.revival_time = time; if(!targ.bot_attack) -- 2.39.5