From 32a55c9229d4604f4f931bfae73dde8ab36f7c65 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Thu, 26 Mar 2015 20:43:29 -0500 Subject: [PATCH] Revert "- Fixed: A_Die didn't consider missiles for the function." This reverts commit 5977cb04d9d24265b823168ccbb663e9ff9c65a2. - It breaks at least one mod (Complex Doom) and who knows how many others. Considering how long A_Die has been around, a random "fix" like this is probably not a good idea. [P.S. Missiles have health and can be damaged by P_DamageMob, so it's not like it never did anything on missiles.] --- src/p_enemy.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/p_enemy.cpp b/src/p_enemy.cpp index 55b49b65e..be0646d4b 100644 --- a/src/p_enemy.cpp +++ b/src/p_enemy.cpp @@ -3203,10 +3203,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_Die) ACTION_PARAM_START(1); ACTION_PARAM_NAME(damagetype, 0); - if (self->flags & MF_MISSILE) - P_ExplodeMissile(self, NULL, NULL); - else - P_DamageMobj (self, NULL, NULL, self->health, damagetype, DMG_FORCED); + P_DamageMobj (self, NULL, NULL, self->health, damagetype, DMG_FORCED); } //