X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fposition.h;h=187fa72ae6f1a92e6b8a7e4e134eab15d8af79e9;hb=84d6fe0f31069bc612f856ab7cd54d9aad7907ca;hp=d47d84b7633c40924e38439e4b41a4fb0dd54ba6;hpb=f74f42b2982e25e180417948771843e8bb6bd4b7;p=stockfish diff --git a/src/position.h b/src/position.h index d47d84b7..187fa72a 100644 --- a/src/position.h +++ b/src/position.h @@ -195,12 +195,11 @@ public: // Piece lists Square piece_list(Color c, PieceType pt, int index) const; - // Attack information to a given square + // Information about attacks to or from a given square Bitboard attackers_to(Square s) const; - Bitboard attackers_to(Square s, Color c) const; - Bitboard piece_attacks(Piece p, Square s) const; - Bitboard pawn_attacks(Square s, Color c) const; - template Bitboard piece_attacks(Square s) const; + Bitboard piece_attacks_from(Piece p, Square s) const; + Bitboard pawn_attacks_from(Square s, Color c) const; + template Bitboard piece_attacks_from(Square s) const; // Properties of moves bool pl_move_is_legal(Move m) const; @@ -433,33 +432,33 @@ inline Square Position::initial_qr_square(Color c) const { return relative_square(c, make_square(initialQRFile, RANK_1)); } -inline Bitboard Position::pawn_attacks(Square s, Color c) const { +inline Bitboard Position::pawn_attacks_from(Square s, Color c) const { return StepAttackBB[piece_of_color_and_type(c, PAWN)][s]; } template // Knight and King -inline Bitboard Position::piece_attacks(Square s) const { +inline Bitboard Position::piece_attacks_from(Square s) const { return StepAttackBB[Piece][s]; } template<> -inline Bitboard Position::piece_attacks(Square s) const { +inline Bitboard Position::piece_attacks_from(Square s) const { return StepAttackBB[WP][s] | StepAttackBB[BP][s]; } template<> -inline Bitboard Position::piece_attacks(Square s) const { +inline Bitboard Position::piece_attacks_from(Square s) const { return bishop_attacks_bb(s, occupied_squares()); } template<> -inline Bitboard Position::piece_attacks(Square s) const { +inline Bitboard Position::piece_attacks_from(Square s) const { return rook_attacks_bb(s, occupied_squares()); } template<> -inline Bitboard Position::piece_attacks(Square s) const { - return piece_attacks(s) | piece_attacks(s); +inline Bitboard Position::piece_attacks_from(Square s) const { + return piece_attacks_from(s) | piece_attacks_from(s); } inline Bitboard Position::checkers() const { @@ -470,11 +469,6 @@ inline bool Position::is_check() const { return st->checkersBB != EmptyBoardBB; } -inline Bitboard Position::attackers_to(Square s, Color c) const { - - return attackers_to(s) & pieces_of_color(c); -} - inline bool Position::pawn_is_passed(Color c, Square s) const { return !(pieces(PAWN, opposite_color(c)) & passed_pawn_mask(c, s)); }