From ba7dda5ed9ea7578a88978db7c9f4294be2bf612 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Tue, 30 Nov 2010 16:55:29 +0200 Subject: [PATCH] Use PlayerDamage_Calculate in freezetag code --- qcsrc/server/mutators/gamemode_freezetag.qc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc index 7ecde3694..f07c30ef5 100644 --- a/qcsrc/server/mutators/gamemode_freezetag.qc +++ b/qcsrc/server/mutators/gamemode_freezetag.qc @@ -257,15 +257,14 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerPhysics) return 1; } -MUTATOR_HOOKFUNCTION(freezetag_PlayerDamage) +MUTATOR_HOOKFUNCTION(freezetag_PlayerDamage_Calculate) { if(g_freezetag) { if(frag_target.freezetag_frozen == 1) { - damage_take = 0; - damage_save = 0; - damage_force = damage_force * cvar("g_freezetag_frozen_force"); + frag_damage = 0; + frag_force = frag_force * cvar("g_freezetag_frozen_force"); } } return 1; @@ -280,7 +279,7 @@ MUTATOR_DEFINITION(gamemode_freezetag) MUTATOR_HOOK(GiveFragsForKill, freezetag_GiveFragsForKill, CBC_ORDER_FIRST); MUTATOR_HOOK(PlayerPreThink, freezetag_PlayerPreThink, CBC_ORDER_FIRST); MUTATOR_HOOK(PlayerPhysics, freezetag_PlayerPhysics, CBC_ORDER_FIRST); - MUTATOR_HOOK(PlayerDamage, freezetag_PlayerDamage, CBC_ORDER_ANY); + MUTATOR_HOOK(PlayerDamage_Calculate, freezetag_PlayerDamage_Calculate, CBC_ORDER_ANY); MUTATOR_ONADD { -- 2.39.2