Merge branch 'master' into Mario/vaporizer_damage

[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 4d990b3cf50608d151a22d771d8b660f54a790f5..d68ff388f8583ae472366f513232a097e4bbb37e 100644 (file)
--- a/qcsrc/server/mutators/mutator_bloodloss.qc
+++ b/qcsrc/server/mutators/mutator_bloodloss.qc
@@ -1,3 +1,7 @@
+#include "../_all.qh"
+
+#include "mutator.qh"
+
 .float bloodloss_timer;
 
 MUTATOR_HOOKFUNCTION(bloodloss_PlayerThink)
@@ -5,36 +9,39 @@ MUTATOR_HOOKFUNCTION(bloodloss_PlayerThink)
        if(IS_PLAYER(self))
        if(self.health <= autocvar_g_bloodloss && self.deadflag == DEAD_NO)
        {
-               self.BUTTON_CROUCH = TRUE;
+               self.BUTTON_CROUCH = true;
 
                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, self.origin, '0 0 0');
                        self.bloodloss_timer = time + 0.5 + random() * 0.5;
                }
        }
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(bloodloss_PlayerJump)
 {
        if(self.health <= autocvar_g_bloodloss)
-               return TRUE;
+               return true;
 
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(bloodloss_BuildMutatorsString)
 {
        ret_string = strcat(ret_string, ":bloodloss");
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(bloodloss_BuildMutatorsPrettyString)
 {
        ret_string = strcat(ret_string, ", Blood loss");
-       return FALSE;
+       return false;
 }
 
 MUTATOR_DEFINITION(mutator_bloodloss)
@@ -44,5 +51,5 @@ MUTATOR_DEFINITION(mutator_bloodloss)
        MUTATOR_HOOK(BuildMutatorsString, bloodloss_BuildMutatorsString, CBC_ORDER_ANY);
        MUTATOR_HOOK(BuildMutatorsPrettyString, bloodloss_BuildMutatorsPrettyString, CBC_ORDER_ANY);
 
-       return FALSE;
+       return false;
 }