Mutators: port to new syntax

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

diff --git a/qcsrc/server/mutators/mutator_midair.qc b/qcsrc/server/mutators/mutator_midair.qc
index f13ae5c8abeb8468ba895ac36b27a10bdef1ec81..4dfb7d5fbe03342e1e730a6fe8834d3c3ce056d1 100644 (file)
--- a/qcsrc/server/mutators/mutator_midair.qc
+++ b/qcsrc/server/mutators/mutator_midair.qc
@@ -1,17 +1,22 @@
+
+#include "mutator.qh"
+
+REGISTER_MUTATOR(midair, cvar("g_midair"));
+
 .float midair_shieldtime;
 
-MUTATOR_HOOKFUNCTION(midair_PlayerDamage)
-{
+MUTATOR_HOOKFUNCTION(midair, PlayerDamage_Calculate)
+{SELFPARAM();
        if(IS_PLAYER(frag_attacker))
        if(IS_PLAYER(frag_target))
        if(time < self.midair_shieldtime)
-               frag_damage = FALSE;
+               frag_damage = false;
 
-       return FALSE;
+       return false;
 }
 
-MUTATOR_HOOKFUNCTION(midair_PlayerPowerups)
-{
+MUTATOR_HOOKFUNCTION(midair, PlayerPowerups)
+{SELFPARAM();
        if(time >= game_starttime)
        if(self.flags & FL_ONGROUND)
        {
@@ -19,36 +24,25 @@ MUTATOR_HOOKFUNCTION(midair_PlayerPowerups)
                self.midair_shieldtime = max(self.midair_shieldtime, time + autocvar_g_midair_shieldtime);
        }
 
-       return FALSE;
+       return false;
 }
 
-MUTATOR_HOOKFUNCTION(midair_PlayerSpawn)
-{
+MUTATOR_HOOKFUNCTION(midair, PlayerSpawn)
+{SELFPARAM();
        if(IS_BOT_CLIENT(self))
                self.bot_moveskill = 0; // disable bunnyhopping
 
-       return FALSE;
+       return false;
 }
 
-MUTATOR_HOOKFUNCTION(midair_BuildMutatorsString)
+MUTATOR_HOOKFUNCTION(midair, BuildMutatorsString)
 {
        ret_string = strcat(ret_string, ":midair");
-       return FALSE;
+       return false;
 }
 
-MUTATOR_HOOKFUNCTION(midair_BuildMutatorsPrettyString)
+MUTATOR_HOOKFUNCTION(midair, BuildMutatorsPrettyString)
 {
        ret_string = strcat(ret_string, ", Midair");
-       return FALSE;
-}
-
-MUTATOR_DEFINITION(mutator_midair)
-{
-       MUTATOR_HOOK(PlayerDamage_Calculate, midair_PlayerDamage, CBC_ORDER_ANY);
-       MUTATOR_HOOK(PlayerPowerups, midair_PlayerPowerups, CBC_ORDER_ANY);
-       MUTATOR_HOOK(PlayerSpawn, midair_PlayerSpawn, CBC_ORDER_ANY);
-       MUTATOR_HOOK(BuildMutatorsString, midair_BuildMutatorsString, CBC_ORDER_ANY);
-       MUTATOR_HOOK(BuildMutatorsPrettyString, midair_BuildMutatorsPrettyString, CBC_ORDER_ANY);
-
-       return FALSE;
+       return false;
 }