X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=19350e5bde31694604f2d10ee462d1cca59eb3fa;hp=f770a8c34270ed8d139d41ba8b5784d7af6d7aa9;hb=7d549c2f02736636db37069b77c395848e04360e;hpb=ef4db75afec0dcd71f0bbe75b5f0b20537c8eac1

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;