]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Use PlayerDamage_Calculate in freezetag code
authorFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 14:55:29 +0000 (16:55 +0200)
committerFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 14:55:29 +0000 (16:55 +0200)
qcsrc/server/mutators/gamemode_freezetag.qc

index 7ecde3694025e5e3dfdf8c1cc9ee91dec112def8..f07c30ef553df38ce533789c2b35e0dbe6f9fb7e 100644 (file)
@@ -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
        {