From 0d9f8199cd2d622a26d111f6179b966ed6008d05 Mon Sep 17 00:00:00 2001 From: terminx Date: Sat, 29 Apr 2006 06:45:46 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.eduke32.com/eduke32@124 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/player.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c index bb8bb195b..5d373d031 100644 --- a/polymer/eduke32/source/player.c +++ b/polymer/eduke32/source/player.c @@ -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<