zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't perform a switch back to the last full weapon when switching to an empty weapon if the player happened to pick up ammo for the weapon during the time it took to ready it.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@124 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-04-29 06:45:46 +00:00
parent 76af69d72d
commit 0d9f8199cd
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/source/player.c
View file

@ -4413,7 +4413,7 @@ HORIZONLY:
if(p->show_empty_weapon > 0)
{
p->show_empty_weapon--;
if(p->show_empty_weapon == 0 && (p->weaponswitch & 2))
if(p->show_empty_weapon == 0 && (p->weaponswitch & 2) && p->ammo_amount[p->curr_weapon] <= 0)
{
if(p->last_full_weapon == GROW_WEAPON)
p->subweapon |= (1<<GROW_WEAPON);