#ifndef DEATHTYPES_H
#define DEATHTYPES_H
-#if defined(CSQC)
- #include "util-pre.qh"
- #include "../client/sys-pre.qh"
- #include "../dpdefs/csprogsdefs.qc"
- #include "../client/sys-post.qh"
- #include "../client/Defs.qc"
- #include "../dpdefs/keycodes.qc"
- #include "constants.qh"
- #include "stats.qh"
- #include "../warpzonelib/anglestransform.qh"
- #include "../warpzonelib/mathlib.qh"
- #include "../warpzonelib/common.qh"
- #include "../warpzonelib/client.qh"
- #include "playerstats.qh"
- #include "teams.qh"
- #include "util.qh"
- #include "nades.qh"
- #include "buffs.qh"
- #include "test.qh"
- #include "counting.qh"
- #include "weapons/weapons.qh"
- #include "mapinfo.qh"
- #include "command/markup.qh"
- #include "command/rpn.qh"
- #include "command/generic.qh"
- #include "command/shared_defs.qh"
- #include "urllib.qh"
- #include "animdecide.qh"
- #include "../client/command/cl_cmd.qh"
- #include "monsters/monsters.qh"
- #include "../client/autocvars.qh"
- #include "notifications.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
- #include "util-pre.qh"
- #include "../server/sys-pre.qh"
- #include "../dpdefs/progsdefs.qc"
- #include "../dpdefs/dpextensions.qc"
- #include "../server/sys-post.qh"
- #include "../warpzonelib/anglestransform.qh"
- #include "../warpzonelib/mathlib.qh"
- #include "../warpzonelib/common.qh"
- #include "../warpzonelib/util_server.qh"
- #include "../warpzonelib/server.qh"
- #include "constants.qh"
- #include "stats.qh"
- #include "teams.qh"
- #include "util.qh"
- #include "nades.qh"
- #include "buffs.qh"
- #include "test.qh"
- #include "counting.qh"
- #include "urllib.qh"
- #include "command/markup.qh"
- #include "command/rpn.qh"
- #include "command/generic.qh"
- #include "command/shared_defs.qh"
- #include "net_notice.qh"
- #include "animdecide.qh"
- #include "monsters/monsters.qh"
- #include "monsters/sv_monsters.qh"
- #include "monsters/spawn.qh"
- #include "weapons/config.qh"
- #include "weapons/weapons.qh"
- #include "../server/weapons/accuracy.qh"
- #include "../server/weapons/common.qh"
- #include "../server/weapons/csqcprojectile.qh"
- #include "../server/weapons/hitplot.qh"
- #include "../server/weapons/selection.qh"
- #include "../server/weapons/spawning.qh"
- #include "../server/weapons/throwing.qh"
- #include "../server/weapons/tracing.qh"
- #include "../server/weapons/weaponstats.qh"
- #include "../server/weapons/weaponsystem.qh"
- #include "../server/t_items.qh"
- #include "../server/autocvars.qh"
- #include "../server/constants.qh"
- #include "../server/defs.qh"
- #include "notifications.qh"
-#endif
+#include "notifications.qh"
// ================================
// Deathtypes, reworked by Samual
#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) \
DEATHTYPE(DEATH_TURRET_PLASMA, DEATH_SELF_TURRET_PLASMA, NO_MSG, NORMAL_POS) \
DEATHTYPE(DEATH_TURRET_TESLA, DEATH_SELF_TURRET_TESLA, NO_MSG, NORMAL_POS) \
DEATHTYPE(DEATH_TURRET_WALK_GUN, DEATH_SELF_TURRET_WALK_GUN, NO_MSG, NORMAL_POS) \
- DEATHTYPE(DEATH_TURRET_WALK_MEELE, DEATH_SELF_TURRET_WALK_MEELE, NO_MSG, NORMAL_POS) \
+ DEATHTYPE(DEATH_TURRET_WALK_MELEE, DEATH_SELF_TURRET_WALK_MELEE, NO_MSG, NORMAL_POS) \
DEATHTYPE(DEATH_TURRET_WALK_ROCKET, DEATH_SELF_TURRET_WALK_ROCKET, NO_MSG, DEATH_TURRET_LAST) \
DEATHTYPE(DEATH_VH_BUMB_DEATH, DEATH_SELF_VH_BUMB_DEATH, DEATH_MURDER_VH_BUMB_DEATH, DEATH_VHFIRST) \
DEATHTYPE(DEATH_VH_BUMB_GUN, NO_MSG, DEATH_MURDER_VH_BUMB_GUN, NORMAL_POS) \
#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))
{
const int HITTYPE_BOUNCE = 0x400;
const int HITTYPE_RESERVED2 = 0x800;
const int HITTYPE_RESERVED = 0x1000; // unused yet
-#endif
\ No newline at end of file
+#endif