From: DeaDDooMER Date: Fri, 4 Jan 2019 19:58:38 +0000 (+0300) Subject: Revert "superminigun is using shells, not bullets; fixed `hasAmmoForWeapon()`" X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=dec9e3260140baab3645be36492a1e0c1ea1fe32;p=d2df-sdl.git Revert "superminigun is using shells, not bullets; fixed `hasAmmoForWeapon()`" This reverts commit 0703593e5048c7123ee86693a42512d663306833. --- diff --git a/src/game/g_player.pas b/src/game/g_player.pas index eaca77a..8628d4a 100644 --- a/src/game/g_player.pas +++ b/src/game/g_player.pas @@ -3574,8 +3574,8 @@ begin result := false; case weapon of WEAPON_KASTET, WEAPON_SAW: result := true; - WEAPON_SHOTGUN1, WEAPON_SHOTGUN2, WEAPON_SUPERPULEMET: result := (FAmmo[A_SHELLS] > 0); - WEAPON_PISTOL, WEAPON_CHAINGUN: result := (FAmmo[A_BULLETS] > 0); + WEAPON_SHOTGUN1, WEAPON_SHOTGUN2: result := (FAmmo[A_SHELLS] > 0); + WEAPON_PISTOL, WEAPON_CHAINGUN, WEAPON_SUPERPULEMET: result := (FAmmo[A_BULLETS] > 0); WEAPON_ROCKETLAUNCHER: result := (FAmmo[A_ROCKETS] > 0); WEAPON_PLASMA, WEAPON_BFG: result := (FAmmo[A_CELLS] > 0); WEAPON_FLAMETHROWER: result := (FAmmo[A_FUEL] > 0);