commit a0a4303a99c8dda72cbe3ff00f26157c2a639fcd
Author:     James Haley <haleyjd@hotmail.com>
AuthorDate: Wed Sep 24 20:22:57 2014 -0500
Commit:     James Haley <haleyjd@hotmail.com>
CommitDate: Wed Sep 24 20:22:57 2014 -0500

    Upstream fix to torpedo weapon changing

    Use of the wrong enum value as an index into weaponinfo left the
    torpedo's selectability accidentally relying on you having 30 or more
    rockets instead of cells. Verified against binary as a choco error.
---
 src/strife/p_user.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/strife/p_user.c b/src/strife/p_user.c
index 78b8df03..bf082e99 100644
--- a/src/strife/p_user.c
+++ b/src/strife/p_user.c
@@ -457,7 +457,9 @@ void P_PlayerThink (player_t* player)
         {
             if(player->weaponowned[wp_torpedo] && player->readyweapon == wp_mauler)
             {
-                if(player->ammo[weaponinfo[am_cell].ammo] >= 30)
+                // haleyjd 20140924: bug fix - using wrong enum value am_cell
+                // caused this to check the missile launcher for rocket ammo
+                if(player->ammo[weaponinfo[wp_torpedo].ammo] >= 30)
                     newweapon = wp_torpedo;
             }
         }