zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-16 01:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- 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.

Browse source 
SVN r4029 (trunk)
This commit is contained in:
Braden Obrzut 2013-01-18 18:19:05 +00:00
parent 3e1aa40461
commit 76b5757dab
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_pspr.cpp
View file

@ -818,10 +818,8 @@ DEFINE_ACTION_FUNCTION(AInventory, A_Lower)
if (player->playerstate == PST_DEAD) if (player->playerstate == PST_DEAD)
{ // Player is dead, so don't bring up a pending weapon { // Player is dead, so don't bring up a pending weapon
psp->sy = WEAPONBOTTOM; psp->sy = WEAPONBOTTOM;
return;
} // Player is dead, so keep the weapon off screen
if (player->health <= 0)
{ // Player is dead, so keep the weapon off screen
P_SetPsprite (player, ps_weapon, NULL); P_SetPsprite (player, ps_weapon, NULL);
return; return;
} }