Fix a bug in generate_piece_checks()

[stockfish] / src / movegen.cpp

diff --git a/src/movegen.cpp b/src/movegen.cpp
index 4e01d418a58d85661061612595cd77b81c3d6132..83f844484720169118763e9ffe7f056fa4707de1 100644 (file)
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -848,23 +848,20 @@ namespace {
 
     // Direct checks
     b = target & ~dc;
-    if (Piece != KING || b)
+    Bitboard checkSqs = pos.attacks_from<Piece>(ksq) & pos.empty_squares();
+    if (Piece == KING || !checkSqs)
+        return mlist;
+
+    while (b)
     {
-        Bitboard checkSqs = pos.attacks_from<Piece>(ksq) & pos.empty_squares();
-        if (!checkSqs)
-            return mlist;
+        Square from = pop_1st_bit(&b);
+        if (   (Piece == QUEEN  && !(QueenPseudoAttacks[from]  & checkSqs))
+            || (Piece == ROOK   && !(RookPseudoAttacks[from]   & checkSqs))
+            || (Piece == BISHOP && !(BishopPseudoAttacks[from] & checkSqs)))
+            continue;
 
-        while (b)
-        {
-            Square from = pop_1st_bit(&b);
-            if (   (Piece == QUEEN  && !(QueenPseudoAttacks[from]  & checkSqs))
-                || (Piece == ROOK   && !(RookPseudoAttacks[from]   & checkSqs))
-                || (Piece == BISHOP && !(BishopPseudoAttacks[from] & checkSqs)))
-                continue;
-
-            Bitboard bb = pos.attacks_from<Piece>(from) & checkSqs;
-            SERIALIZE_MOVES(bb);
-        }
+        Bitboard bb = pos.attacks_from<Piece>(from) & checkSqs;
+        SERIALIZE_MOVES(bb);
     }
     return mlist;
   }