Purify PlayerDamage_Calculate

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

diff --git a/qcsrc/common/mutators/mutator/midair/midair.qc b/qcsrc/common/mutators/mutator/midair/midair.qc
index aaae006f52698fd1914a02a21ace52b4f6f29865..adf3c3a1f3a9aa8f9f5ba9bbf14da86297eeae63 100644 (file)
--- a/qcsrc/common/mutators/mutator/midair/midair.qc
+++ b/qcsrc/common/mutators/mutator/midair/midair.qc
@@ -7,10 +7,13 @@ REGISTER_MUTATOR(midair, cvar("g_midair"));
 .float midair_shieldtime;
 
 MUTATOR_HOOKFUNCTION(midair, PlayerDamage_Calculate)
-{SELFPARAM();
+{
+       entity frag_attacker = M_ARGV(1, entity);
+       entity frag_target = M_ARGV(2, entity);
+       
        if(IS_PLAYER(frag_attacker))
        if(IS_PLAYER(frag_target))
-       if(time < self.midair_shieldtime)
+       if(time < frag_target.midair_shieldtime)
                frag_damage = false;
 
        return false;
@@ -19,7 +22,7 @@ MUTATOR_HOOKFUNCTION(midair, PlayerDamage_Calculate)
 MUTATOR_HOOKFUNCTION(midair, PlayerPowerups)
 {SELFPARAM();
        if(time >= game_starttime)
-       if(self.flags & FL_ONGROUND)
+       if(IS_ONGROUND(self))
        {
                self.effects |= (EF_ADDITIVE | EF_FULLBRIGHT);
                self.midair_shieldtime = max(self.midair_shieldtime, time + autocvar_g_midair_shieldtime);