shithub: choc

Info  •  Files  •  Log  •  Branches

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.

--- a/src/strife/p_user.c

+++ b/src/strife/p_user.c

@@ -457,7 +457,9 @@

         {

             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;

             }

         }