Merge branch 'master' into Mario/fullbright_skins

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

diff --git a/qcsrc/common/mutators/mutator/invincibleproj/invincibleproj.qc b/qcsrc/common/mutators/mutator/invincibleproj/invincibleproj.qc
index 5a781a8812f3e0a9ca8381928488e568c1feaa67..5bdafa1f12a8b9eb598e51066c05de15d511d198 100644 (file)
--- a/qcsrc/common/mutators/mutator/invincibleproj/invincibleproj.qc
+++ b/qcsrc/common/mutators/mutator/invincibleproj/invincibleproj.qc
@@ -3,23 +3,22 @@ REGISTER_MUTATOR(invincibleprojectiles, cvar("g_invincible_projectiles"));
 
 MUTATOR_HOOKFUNCTION(invincibleprojectiles, EditProjectile)
 {
-       if(other.health)
+       entity proj = M_ARGV(1, entity);
+
+       if(proj.health)
        {
                // disable health which in effect disables damage calculations
-               other.health = 0;
+               proj.health = 0;
        }
-       return 0;
 }
 
 MUTATOR_HOOKFUNCTION(invincibleprojectiles, BuildMutatorsString)
 {
-       ret_string = strcat(ret_string, ":InvincibleProjectiles");
-       return 0;
+       M_ARGV(0, string) = strcat(M_ARGV(0, string), ":InvincibleProjectiles");
 }
 
 MUTATOR_HOOKFUNCTION(invincibleprojectiles, BuildMutatorsPrettyString)
 {
-       ret_string = strcat(ret_string, ", Invincible Projectiles");
-       return 0;
+       M_ARGV(0, string) = strcat(M_ARGV(0, string), ", Invincible Projectiles");
 }
 #endif