From 7d549c2f02736636db37069b77c395848e04360e Mon Sep 17 00:00:00 2001 From: DeaDDooMER Date: Fri, 4 Jan 2019 22:58:38 +0300 Subject: [PATCH] Revert "slightly better prioritized weapon selection (code cleanup, should not affect the actual selection)" This reverts commit fc965d7cd1a1889f7407070f2bc19bc4ac48fd01. --- src/game/g_player.pas | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/game/g_player.pas b/src/game/g_player.pas index f770a8c..19350e5 100644 --- a/src/game/g_player.pas +++ b/src/game/g_player.pas @@ -3743,21 +3743,13 @@ begin // no cycling for i := 0 to High(wantThisWeapon) do wantThisWeapon[i] := false; wwc := 0; - - curlidx := -1; // start from a weapon with a highest priority (-1, 'cause loop will immediately increment this index) - for i := 0 to High(FWeapon) do begin if (FNextWeap and (1 shl i)) <> 0 then begin cwi := real2log(i); - if (cwi >= 0) then - begin - wantThisWeapon[cwi] := true; - Inc(wwc); - // if we hit currently selected weapon, start seachring from it, so we'll get "next weaker" weapon - if (i = FCurrWeap) then curlidx := cwi; // compare real, start from logical - end; + if (cwi >= 0) then wantThisWeapon[cwi] := true; + Inc(wwc); end; end; @@ -3781,7 +3773,12 @@ begin exit; end; + // exclude currently selected weapon from the set + curlidx := real2log(FCurrWeap); //e_WriteLog(Format('*** wwc=%d; currweap=%d; logweap=%d', [wwc, FCurrWeap, curlidx]), TMsgType.Warning); + //e_WriteLog(Format('FCurrWeap=%d; curlidx=%d', [FCurrWeap, curlidx]), TMsgType.Warning); + //if (curlidx >= 0) then wantThisWeapon[curlidx] := false; + //if (wwc = 2) then begin Dec(wwc); end; // easy case: switch between two weapons // find next weapon to switch onto cwi := curlidx; -- 2.29.2