Fix semantic of piece_attacks<PAWN>

[stockfish] / src / position.cpp

diff --git a/src/position.cpp b/src/position.cpp
index 770d47f5d17026ef0e0d0f53c7dabfcc502b4354..462088e09c9dee5fc634f0d92fa38a2d5e306876 100644 (file)
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -479,10 +479,9 @@ bool Position::pl_move_is_legal(Move m, Bitboard pinned) const {
 
   Color us = side_to_move();
   Square from = move_from(m);
-  Square ksq = king_square(us);
 
   assert(color_of_piece_on(from) == us);
-  assert(piece_on(ksq) == piece_of_color_and_type(us, KING));
+  assert(piece_on(king_square(us)) == piece_of_color_and_type(us, KING));
 
   // En passant captures are a tricky special case.  Because they are
   // rather uncommon, we do it simply by testing whether the king is attacked
@@ -493,6 +492,7 @@ bool Position::pl_move_is_legal(Move m, Bitboard pinned) const {
       Square to = move_to(m);
       Square capsq = make_square(square_file(to), square_rank(from));
       Bitboard b = occupied_squares();
+      Square ksq = king_square(us);
 
       assert(to == ep_square());
       assert(piece_on(from) == piece_of_color_and_type(us, PAWN));
@@ -509,14 +509,14 @@ bool Position::pl_move_is_legal(Move m, Bitboard pinned) const {
 
   // If the moving piece is a king, check whether the destination
   // square is attacked by the opponent.
-  if (from == ksq)
+  if (type_of_piece_on(from) == KING)
       return !(square_is_attacked(move_to(m), opposite_color(us)));
 
   // A non-king move is legal if and only if it is not pinned or it
   // is moving along the ray towards or away from the king.
   return (   !pinned
           || !bit_is_set(pinned, from)
-          || (direction_between_squares(from, ksq) == direction_between_squares(move_to(m), ksq)));
+          || (direction_between_squares(from, king_square(us)) == direction_between_squares(move_to(m), king_square(us))));
 }
 
 
@@ -667,7 +667,7 @@ inline void Position::update_checkers(Bitboard* pCheckersBB, Square ksq, Square
 
   else if (   Piece != KING
            && !Slider
-           && bit_is_set(piece_attacks<Piece>(ksq), to))
+           && bit_is_set(Piece == PAWN ? pawn_attacks(opposite_color(sideToMove), ksq) : piece_attacks<Piece>(ksq), to))
       set_bit(pCheckersBB, to);
 
   // Discovery checks