Some small updates to buffs system

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / deathtypes.qh

diff --git a/qcsrc/common/deathtypes.qh b/qcsrc/common/deathtypes.qh
index 591c48e17800af077e7eea9536f32d46115e093e..dae684c14f396de255119dac90ba5e99cda98cd4 100644 (file)
--- a/qcsrc/common/deathtypes.qh
+++ b/qcsrc/common/deathtypes.qh
@@ -1,3 +1,8 @@
+#ifndef DEATHTYPES_H
+#define DEATHTYPES_H
+
+#include "notifications.qh"
+
 // ================================
 //  Deathtypes, reworked by Samual
 // ================================
@@ -13,7 +18,7 @@ int DEATH_VHLAST;
 
 #define DEATHTYPES \
        DEATHTYPE(DEATH_AUTOTEAMCHANGE,         DEATH_SELF_AUTOTEAMCHANGE,          NO_MSG,                        DEATH_SPECIAL_START) \
-       DEATHTYPE(DEATH_BUFF_VENGEANCE,         NO_MSG,                             DEATH_MURDER_VENGEANCE,        NORMAL_POS) \
+       DEATHTYPE(DEATH_BUFF,                   NO_MSG,                             DEATH_MURDER_BUFF,             NORMAL_POS) \
        DEATHTYPE(DEATH_CAMP,                   DEATH_SELF_CAMP,                    NO_MSG,                        NORMAL_POS) \
        DEATHTYPE(DEATH_CHEAT,                  DEATH_SELF_CHEAT,                   DEATH_MURDER_CHEAT,            NORMAL_POS) \
        DEATHTYPE(DEATH_CUSTOM,                 DEATH_SELF_CUSTOM,                  NO_MSG,                        NORMAL_POS) \
@@ -113,7 +118,7 @@ DEATHTYPES
 #define DEATH_WEAPONOF(t)             (DEATH_ISSPECIAL(t) ? 0 : DEATH_WEAPONOFWEAPONDEATH(t))
 #define WEP_VALID(w)                  ((w) >= WEP_FIRST && (w) <= WEP_LAST)
 
-string Deathtype_Name(float deathtype)
+string Deathtype_Name(int deathtype)
 {
        if(DEATH_ISSPECIAL(deathtype))
        {
@@ -131,3 +136,4 @@ const int HITTYPE_SPLASH = 0x200; // automatically set by RadiusDamage
 const int HITTYPE_BOUNCE = 0x400;
 const int HITTYPE_RESERVED2 = 0x800;
 const int HITTYPE_RESERVED = 0x1000; // unused yet
+#endif