From 07557404f54fd110ea1186d5d071d301dd649d38 Mon Sep 17 00:00:00 2001 From: Magus Date: Thu, 14 Dec 2023 14:39:17 +0700 Subject: [PATCH] DAM_HIT and DAM_CRITICAL are source only flags --- docs/changelog.md | 4 ++++ source/gl_g_damage_mod.ssl | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index 494d78a..12be556 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,5 +1,9 @@ ## Changelog +### Version 12.15 + +- Really ensured that instant death criticals inflict at least 1 point of damage. + ### Version 12.14 - Ensured that instant death criticals inflict at least 1 point of damage. diff --git a/source/gl_g_damage_mod.ssl b/source/gl_g_damage_mod.ssl index d1771e8..e81f296 100644 --- a/source/gl_g_damage_mod.ssl +++ b/source/gl_g_damage_mod.ssl @@ -40,10 +40,8 @@ #define sec_damage_mod_ammo_dr "damage_mod_ammo_dr" #define sec_damage_mod_ammo_type "damage_mod_ammo_type" -#define is_critical_hit(flags) ((flags bwand DAM_CRITICAL) != 0) #define is_bypassing_armor(flags) ((flags bwand DAM_BYPASS) != 0) -#define flag_instadeath (DAM_HIT bwor DAM_CRITICAL bwor DAM_DEAD) -#define is_instadeath_hit(flags) ((flags bwand flag_instadeath) == flag_instadeath) +#define is_instadeath_hit(flags) ((flags bwand DAM_DEAD) != 0) variable begin old_total = 0, new_total = 0;