Replace all player/bot/spectator classname checks with macros

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator_vampire.qc

diff --git a/qcsrc/server/mutators/mutator_vampire.qc b/qcsrc/server/mutators/mutator_vampire.qc
index dbaa654a944af7693d5432c15486caf10e27c99c..40a925b3ce835fbc24c9b64f424d9022690dd0bc 100644 (file)
--- a/qcsrc/server/mutators/mutator_vampire.qc
+++ b/qcsrc/server/mutators/mutator_vampire.qc
@@ -5,12 +5,12 @@ MUTATOR_HOOKFUNCTION(vampire_PlayerDamage)
        if(g_minstagib)
        {
                // minstagib: each hit means +1 ammo
-               frag_attacker.ammo_cells += 1;
+               frag_attacker.ammo_cells += 2; // note: 1 cell was deducted for the shot
        }
        else
        {
                // otherwise: each hit gets damage back
-               frag_attacker.health += damage_take;
+               frag_attacker.health = frag_attacker.health + bound(0, damage_take, self.health);
        }
        return 0;
 }
@@ -29,7 +29,7 @@ MUTATOR_HOOKFUNCTION(vampire_BuildMutatorsPrettyString)
 
 MUTATOR_DEFINITION(mutator_vampire)
 {
-       MUTATOR_HOOK(PlayerDamage, vampire_PlayerDamage, CBC_ORDER_ANY);
+       MUTATOR_HOOK(PlayerDamage_SplitHealthArmor, vampire_PlayerDamage, CBC_ORDER_ANY);
        MUTATOR_HOOK(BuildMutatorsString, vampire_BuildMutatorsString, CBC_ORDER_ANY);
        MUTATOR_HOOK(BuildMutatorsPrettyString, vampire_BuildMutatorsPrettyString, CBC_ORDER_ANY);