diff options
| author | Rene Stoeckel <[email protected]> | 2004-09-12 18:25:49 +0000 |
|---|---|---|
| committer | Rene Stoeckel <[email protected]> | 2004-09-12 18:25:49 +0000 |
| commit | 64693c675f2a8a94ad0be72d5f6575937eab1300 (patch) | |
| tree | c56cfbdb9cd0d463417663640bb4dd6f5faadbcf /src/jake2/game/GamePWeapon.java | |
| parent | 6f76cc5ea1a24c918ceb82136328ae4fb8c526a4 (diff) | |
fixed an inventory bug and did some cleanups
Diffstat (limited to 'src/jake2/game/GamePWeapon.java')
| -rw-r--r-- | src/jake2/game/GamePWeapon.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jake2/game/GamePWeapon.java b/src/jake2/game/GamePWeapon.java index cd915e8..7270f5c 100644 --- a/src/jake2/game/GamePWeapon.java +++ b/src/jake2/game/GamePWeapon.java @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // Created on 16.11.2003 by RST. -// $Id: GamePWeapon.java,v 1.3 2004-09-10 19:02:55 salomo Exp $ +// $Id: GamePWeapon.java,v 1.4 2004-09-12 18:25:49 salomo Exp $ package jake2.game; @@ -1233,7 +1233,7 @@ public class GamePWeapon { if (ent.client.weaponstate == Defines.WEAPON_READY) { if (((ent.client.latched_buttons | ent.client.buttons) & Defines.BUTTON_ATTACK) != 0) { ent.client.latched_buttons &= ~Defines.BUTTON_ATTACK; - if ((0 != ent.client.ammo_index) + if ((0 == ent.client.ammo_index) || (ent.client.pers.inventory[ent.client.ammo_index] >= ent.client.pers.weapon.quantity)) { ent.client.ps.gunframe= FRAME_FIRE_FIRST; |