From 76b5757dabb1e0b99304c830c31e79973f9f8244 Mon Sep 17 00:00:00 2001 From: Braden Obrzut Date: Fri, 18 Jan 2013 18:19:05 +0000 Subject: [PATCH] - Fixed: 0 duration A_Lower loops could cause an infinite loop since A_Lower checked if the player was dead in two different ways and returned before the second one. SVN r4029 (trunk) --- src/p_pspr.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp index 5f0943ca0a..8d901ec2eb 100644 --- a/src/p_pspr.cpp +++ b/src/p_pspr.cpp @@ -818,10 +818,8 @@ DEFINE_ACTION_FUNCTION(AInventory, A_Lower) if (player->playerstate == PST_DEAD) { // Player is dead, so don't bring up a pending weapon psp->sy = WEAPONBOTTOM; - return; - } - if (player->health <= 0) - { // Player is dead, so keep the weapon off screen + + // Player is dead, so keep the weapon off screen P_SetPsprite (player, ps_weapon, NULL); return; }