Retire move_attacks_square()

[stockfish] / src / search.cpp

diff --git a/src/search.cpp b/src/search.cpp
index 96e40515e9e26a3192b02be102bc9aac20c7da89..2b51a698b0de3e40c8208255251a92fc0149faf0 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -1411,12 +1411,10 @@ split_point_start: // At split points actual search starts from here
     assert(!pos.is_capture_or_promotion(m));
     assert(!pos.is_passed_pawn_push(m));
 
     assert(!pos.is_capture_or_promotion(m));
     assert(!pos.is_passed_pawn_push(m));
 

-    Square mfrom, mto, tfrom, tto;
-
-    mfrom = from_sq(m);
-    mto = to_sq(m);
-    tfrom = from_sq(threat);
-    tto = to_sq(threat);
+    Square mfrom = from_sq(m);
+    Square mto = to_sq(m);
+    Square tfrom = from_sq(threat);
+    Square tto = to_sq(threat);

 
     // Case 1: Don't prune moves which move the threatened piece
     if (mfrom == tto)
 
     // Case 1: Don't prune moves which move the threatened piece
     if (mfrom == tto)


@@ -1424,11 +1422,26 @@ split_point_start: // At split points actual search starts from here
 
     // Case 2: If the threatened piece has value less than or equal to the
     // value of the threatening piece, don't prune moves which defend it.
 
     // Case 2: If the threatened piece has value less than or equal to the
     // value of the threatening piece, don't prune moves which defend it.

-    if (   pos.is_capture(threat)
+    if (    pos.is_capture(threat)

         && (   PieceValue[MG][pos.piece_on(tfrom)] >= PieceValue[MG][pos.piece_on(tto)]
         && (   PieceValue[MG][pos.piece_on(tfrom)] >= PieceValue[MG][pos.piece_on(tto)]

-            || type_of(pos.piece_on(tfrom)) == KING)
-        && pos.move_attacks_square(m, tto))
-        return true;
+            || type_of(pos.piece_on(tfrom)) == KING))
+    {
+        // Update occupancy as if the piece is moving
+        Bitboard occ = pos.pieces() ^ mfrom ^ mto;
+        Piece piece = pos.piece_on(mfrom);
+
+        // The moved piece attacks the square 'tto' ?
+        if (pos.attacks_from(piece, mto, occ) & tto)
+            return true;
+
+        // Scan for possible X-ray attackers behind the moved piece
+        Bitboard xray =  (attacks_bb<  ROOK>(tto, occ) & pos.pieces(color_of(piece), QUEEN, ROOK))
+                       | (attacks_bb<BISHOP>(tto, occ) & pos.pieces(color_of(piece), QUEEN, BISHOP));
+
+        // Verify attackers are triggered by our move and not already existing
+        if (xray && (xray ^ (xray & pos.attacks_from<QUEEN>(tto))))
+            return true;
+    }

 
     // Case 3: If the moving piece in the threatened move is a slider, don't
     // prune safe moves which block its ray.
 
     // Case 3: If the moving piece in the threatened move is a slider, don't
     // prune safe moves which block its ray.