DAM_HIT and DAM_CRITICAL are source only flags

BGforgeNet · Dec 14, 2023 · 0755740 · 0755740
1 parent eaa3f62
commit 0755740
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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;