X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=bcbfc850d0c8b15eb4677f63b447996fde6fdeca;hp=c391d8247c72f4530d78d942a1d087eb1d472180;hb=20621ed3e3588468c44ab2f69a82eedc6f5c0119;hpb=2aec8fb9560dc1fc266437ad4276db2b0381d9d5;ds=sidebyside diff --git a/src/position.h b/src/position.h index c391d824..bcbfc850 100644 --- a/src/position.h +++ b/src/position.h @@ -342,29 +342,17 @@ inline Square Position::castle_rook_square(CastleRight f) const { return castleRookSquare[f]; } -template<> -inline Bitboard Position::attacks_from(Square s, Color c) const { - return StepAttacksBB[make_piece(c, PAWN)][s]; -} - -template // Knight and King and white pawns +template inline Bitboard Position::attacks_from(Square s) const { - return StepAttacksBB[Piece][s]; + return Pt == BISHOP ? bishop_attacks_bb(s, occupied_squares()) + : Pt == ROOK ? rook_attacks_bb(s, occupied_squares()) + : Pt == QUEEN ? attacks_from(s) | attacks_from(s) + : StepAttacksBB[Pt][s]; } template<> -inline Bitboard Position::attacks_from(Square s) const { - return bishop_attacks_bb(s, occupied_squares()); -} - -template<> -inline Bitboard Position::attacks_from(Square s) const { - return rook_attacks_bb(s, occupied_squares()); -} - -template<> -inline Bitboard Position::attacks_from(Square s) const { - return attacks_from(s) | attacks_from(s); +inline Bitboard Position::attacks_from(Square s, Color c) const { + return StepAttacksBB[make_piece(c, PAWN)][s]; } inline Bitboard Position::attacks_from(Piece p, Square s) const {