X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=f80d72195105d1d96dcbffd5a0f7a63dd8efb2fd;hp=8f4331079506d89ee91e6c0b00d13701ad8c5153;hb=888edf84e9dcca93ffd056846e492942c1a18e38;hpb=3bc93c7ecd534237343aaa3b83dca053c53b9bc5 diff --git a/src/game/g_player.pas b/src/game/g_player.pas index 8f43310..f80d721 100644 --- a/src/game/g_player.pas +++ b/src/game/g_player.pas @@ -2043,9 +2043,11 @@ function TPlayer.maySwitch(Weapon: Byte) : Boolean; begin result := true; if (Weapon = WEAPON_KASTET) and (FSkipFist <> 0) then + begin if (FSkipFist = 1) and (not (R_BERSERK in FRulez)) then - result := false - else if (FSwitchToEmpty = 0) and not hasAmmoForWeapon(Weapon) then + result := false; + end + else if (FSwitchToEmpty = 0) and (not hasAmmoForWeapon(Weapon)) then result := false end;