From: travi$ Date: Sun, 27 Mar 2022 18:13:33 +0000 (+0300) Subject: Always switch to berserk X-Git-Url: https://deadsoftware.ru/gitweb?a=commitdiff_plain;h=9daac605a3cc6dc27c60253022bf6afbcd22fc0d;hp=0787142e3ce216473e2197c82e4088ac41031fce;p=d2df-sdl.git Always switch to berserk --- diff --git a/src/game/g_options.pas b/src/game/g_options.pas index fa6dafd..29df099 100644 --- a/src/game/g_options.pas +++ b/src/game/g_options.pas @@ -62,7 +62,6 @@ var gsSDLSampleRate: Integer; gsSDLBufferSize: Integer; gDefaultMegawadStart: AnsiString; - gBerserkAutoswitch: Boolean; glNPOTOverride: Boolean = false; (* Latched game settings *) @@ -254,7 +253,6 @@ begin wadoptFast := False; e_FastScreenshots := True; gDefaultMegawadStart := DF_Default_Megawad_Start; - gBerserkAutoswitch := True; g_dbg_scale := 1.0; gSaveStats := False; diff --git a/src/game/g_player.pas b/src/game/g_player.pas index f67884f..23be583 100644 --- a/src/game/g_player.pas +++ b/src/game/g_player.pas @@ -3978,16 +3978,6 @@ begin end; function TPlayer.PickItem(ItemType: Byte; arespawn: Boolean; var remove: Boolean): Boolean; - - function allowBerserkSwitching (): Boolean; - begin - if (FBFGFireCounter <> -1) then begin result := false; exit; end; - result := true; - if gBerserkAutoswitch then exit; - if not conIsCheatsEnabled then exit; - result := false; - end; - var a: Boolean; switchWeapon: Byte = 255; @@ -4343,8 +4333,12 @@ begin if not (R_BERSERK in FRulez) then begin Include(FRulez, R_BERSERK); - if (shouldSwitch(WP_LAST + 1, false)) then - QueueWeaponSwitch(WEAPON_KASTET); + if (FBFGFireCounter = -1) then + begin + FCurrWeap := WEAPON_KASTET; + resetWeaponQueue(); + FModel.SetWeapon(WEAPON_KASTET); + end; if gFlash <> 0 then begin Inc(FPain, 100); @@ -8040,7 +8034,6 @@ end; begin - conRegVar('cheat_berserk_autoswitch', @gBerserkAutoswitch, 'autoswitch to fist when berserk pack taken', '', true, true); conRegVar('player_indicator', @gPlayerIndicator, 'Draw indicator only for current player, also for teammates, or not at all', 'Draw indicator only for current player, also for teammates, or not at all'); conRegVar('player_indicator_style', @gPlayerIndicatorStyle, 'Visual appearance of indicator', 'Visual appearance of indicator'); end.