diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 64b400d3dbb6c679b1fdb5a8f6ec18cf788ac078..300979a87de4011a595a4d59af4704d9132f74a3 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
if not (R_BERSERK in FRulez) then
begin
Include(FRulez, R_BERSERK);
- if FBFGFireCounter = -1 then
+ if gBerserkAutoswitch and (FBFGFireCounter = -1) then
begin
FCurrWeap := WEAPON_KASTET;
resetWeaponQueue();
FModel.SetWeapon(WEAPON_KASTET);
end;
if gFlash <> 0 then
+ begin
Inc(FPain, 100);
if gFlash = 2 then Inc(FPickup, 5);
+ end;
FBerserk := gTime+30000;
Result := True;
remove := True;