Mutators: port to new syntax

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

diff --git a/qcsrc/server/mutators/mutator_bloodloss.qc b/qcsrc/server/mutators/mutator_bloodloss.qc
index 08e14199ee3f4d460044f02f056cc2750b2692a0..5db1f98a0eb9c84e953ab2409655958f64914f5b 100644 (file)
--- a/qcsrc/server/mutators/mutator_bloodloss.qc
+++ b/qcsrc/server/mutators/mutator_bloodloss.qc
@@ -1,7 +1,12 @@
+
+#include "mutator.qh"
+
+REGISTER_MUTATOR(bloodloss, cvar("g_bloodloss"));
+
 .float bloodloss_timer;
 
-MUTATOR_HOOKFUNCTION(bloodloss_PlayerThink)
-{
+MUTATOR_HOOKFUNCTION(bloodloss, PlayerPreThink)
+{SELFPARAM();
        if(IS_PLAYER(self))
        if(self.health <= autocvar_g_bloodloss && self.deadflag == DEAD_NO)
        {
@@ -9,7 +14,10 @@ MUTATOR_HOOKFUNCTION(bloodloss_PlayerThink)
 
                if(time >= self.bloodloss_timer)
                {
-                       self.event_damage(self, self, 1, DEATH_ROT, self.origin, '0 0 0');
+                       if(self.vehicle)
+                               vehicles_exit(VHEF_RELEASE);
+                       if(self.event_damage)
+                               self.event_damage(self, self, 1, DEATH_ROT.m_id, self.origin, '0 0 0');
                        self.bloodloss_timer = time + 0.5 + random() * 0.5;
                }
        }
@@ -17,32 +25,22 @@ MUTATOR_HOOKFUNCTION(bloodloss_PlayerThink)
        return false;
 }
 
-MUTATOR_HOOKFUNCTION(bloodloss_PlayerJump)
-{
+MUTATOR_HOOKFUNCTION(bloodloss, PlayerJump)
+{SELFPARAM();
        if(self.health <= autocvar_g_bloodloss)
                return true;
 
        return false;
 }
 
-MUTATOR_HOOKFUNCTION(bloodloss_BuildMutatorsString)
+MUTATOR_HOOKFUNCTION(bloodloss, BuildMutatorsString)
 {
        ret_string = strcat(ret_string, ":bloodloss");
        return false;
 }
 
-MUTATOR_HOOKFUNCTION(bloodloss_BuildMutatorsPrettyString)
+MUTATOR_HOOKFUNCTION(bloodloss, BuildMutatorsPrettyString)
 {
        ret_string = strcat(ret_string, ", Blood loss");
        return false;
 }
-
-MUTATOR_DEFINITION(mutator_bloodloss)
-{
-       MUTATOR_HOOK(PlayerPreThink, bloodloss_PlayerThink, CBC_ORDER_ANY);
-       MUTATOR_HOOK(PlayerJump, bloodloss_PlayerJump, CBC_ORDER_ANY);
-       MUTATOR_HOOK(BuildMutatorsString, bloodloss_BuildMutatorsString, CBC_ORDER_ANY);
-       MUTATOR_HOOK(BuildMutatorsPrettyString, bloodloss_BuildMutatorsPrettyString, CBC_ORDER_ANY);
-
-       return false;
-}