DEADSOFTWARE

Revert "Revert "superminigun is using shells, not bullets; fixed `hasAmmoForWeapon...
authorDeaDDooMER <deaddoomer@deadsoftware.ru>
Fri, 13 Dec 2019 21:44:05 +0000 (00:44 +0300)
committerDeaDDooMER <deaddoomer@deadsoftware.ru>
Fri, 13 Dec 2019 21:44:05 +0000 (00:44 +0300)
src/game/g_player.pas

index f2dc59a787a98b389265177187459089ee8c2621..0cde3c089c1dfe4d0a5d9098721c4e4717d07e4e 100644 (file)
@@ -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);