From: DeaDDooMER <deaddoomer@deadsoftware.ru>
Date: Fri, 13 Dec 2019 21:44:05 +0000 (+0300)
Subject: Revert "Revert "superminigun is using shells, not bullets; fixed `hasAmmoForWeapon... 
X-Git-Url: https://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=commitdiff_plain;h=5b8e9b87a2b3372fd94fdeefdd78c7d483199da1

Revert "Revert "superminigun is using shells, not bullets; fixed `hasAmmoForWeapon()`""

This reverts commit dec9e3260140baab3645be36492a1e0c1ea1fe32.
---

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index f2dc59a..0cde3c0 100644
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -3726,8 +3726,8 @@ begin
   result := false;
   case weapon of
     WEAPON_KASTET, WEAPON_SAW: result := true;
-    WEAPON_SHOTGUN1, WEAPON_SHOTGUN2: result := (FAmmo[A_SHELLS] > 0);
-    WEAPON_PISTOL, WEAPON_CHAINGUN, WEAPON_SUPERPULEMET: result := (FAmmo[A_BULLETS] > 0);
+    WEAPON_SHOTGUN1, WEAPON_SHOTGUN2, WEAPON_SUPERPULEMET: result := (FAmmo[A_SHELLS] > 0);
+    WEAPON_PISTOL, WEAPON_CHAINGUN: 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);