Merge branch 'master' into Mario/entrap_nade

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / vampire / vampire.qc

diff --git a/qcsrc/common/mutators/mutator/vampire/vampire.qc b/qcsrc/common/mutators/mutator/vampire/vampire.qc
index 6a2e1fdb74fead3355e5867d57347e19f090e67a..d245c8059b7856a421dd5bc2a2c3e72e3b262168 100644 (file)
--- a/qcsrc/common/mutators/mutator/vampire/vampire.qc
+++ b/qcsrc/common/mutators/mutator/vampire/vampire.qc
@@ -3,6 +3,10 @@ REGISTER_MUTATOR(vampire, cvar("g_vampire") && !cvar("g_instagib"));
 
 MUTATOR_HOOKFUNCTION(vampire, PlayerDamage_SplitHealthArmor)
 {
+       entity frag_attacker = M_ARGV(1, entity);
+       entity frag_target = M_ARGV(2, entity);
+       float damage_take = M_ARGV(4, float);
+
        if(time >= frag_target.spawnshieldtime)
        if(frag_target != frag_attacker)
        if(!IS_DEAD(frag_target))
@@ -10,19 +14,15 @@ MUTATOR_HOOKFUNCTION(vampire, PlayerDamage_SplitHealthArmor)
                frag_attacker.health += bound(0, damage_take, frag_target.health);
                frag_attacker.health = bound(0, frag_attacker.health, autocvar_g_balance_health_limit);
        }
-
-       return false;
 }
 
 MUTATOR_HOOKFUNCTION(vampire, BuildMutatorsString)
 {
-       ret_string = strcat(ret_string, ":Vampire");
-       return 0;
+       M_ARGV(0, string) = strcat(M_ARGV(0, string), ":Vampire");
 }
 
 MUTATOR_HOOKFUNCTION(vampire, BuildMutatorsPrettyString)
 {
-       ret_string = strcat(ret_string, ", Vampire");
-       return 0;
+       M_ARGV(0, string) = strcat(M_ARGV(0, string), ", Vampire");
 }
 #endif