X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=4583212c5eaa4384aa3311fca345fd34ed58c1da;hp=0939e7504ea457352eecb46fd362789747b9bf5a;hb=b05fbb3733df535a3fdf99e8d832001e57929699;hpb=8307da0de77c9c7bbf7c56a7d9c8a688ff4dfb4e diff --git a/src/position.h b/src/position.h index 0939e750..4583212c 100644 --- a/src/position.h +++ b/src/position.h @@ -37,6 +37,7 @@ struct CheckInfo { Bitboard dcCandidates; Bitboard pinned; Bitboard checkSq[8]; + Square ksq; }; @@ -428,8 +429,8 @@ inline Value Position::non_pawn_material(Color c) const { inline bool Position::is_passed_pawn_push(Move m) const { - return board[move_from(m)] == make_piece(sideToMove, PAWN) - && pawn_is_passed(sideToMove, move_to(m)); + return board[from_sq(m)] == make_piece(sideToMove, PAWN) + && pawn_is_passed(sideToMove, to_sq(m)); } inline int Position::startpos_ply_counter() const { @@ -454,14 +455,14 @@ inline bool Position::is_chess960() const { inline bool Position::is_capture_or_promotion(Move m) const { assert(is_ok(m)); - return is_special(m) ? !is_castle(m) : !square_is_empty(move_to(m)); + return is_special(m) ? !is_castle(m) : !square_is_empty(to_sq(m)); } inline bool Position::is_capture(Move m) const { // Note that castle is coded as "king captures the rook" assert(is_ok(m)); - return (!square_is_empty(move_to(m)) && !is_castle(m)) || is_enpassant(m); + return (!square_is_empty(to_sq(m)) && !is_castle(m)) || is_enpassant(m); } inline PieceType Position::captured_piece_type() const {