}
- // Template generate_piece_moves() with specializations
+ // Template generate_piece_moves() with specializations and overloads
template<PieceType>
MoveStack* generate_piece_moves(const Position&, MoveStack*, Color us, Bitboard);
if (blockSquares != EmptyBoardBB)
{
- // Pieces moves
mlist = generate_piece_moves<PAWN>(pos, mlist, us, blockSquares, pinned);
mlist = generate_piece_moves<KNIGHT>(pos, mlist, us, blockSquares, pinned);
mlist = generate_piece_moves<BISHOP>(pos, mlist, us, blockSquares, pinned);
illegal = true;
if ( square_file(to) == FILE_B
- && ( pos.piece_on(to + DELTA_W) == rook_of_color(them)
- || pos.piece_on(to + DELTA_W) == queen_of_color(them)))
+ && ( pos.piece_on(to + DELTA_W) == piece_of_color_and_type(them, ROOK)
+ || pos.piece_on(to + DELTA_W) == piece_of_color_and_type(them, QUEEN)))
illegal = true;
return !illegal;
if ( Side == QUEEN_SIDE
&& square_file(rsq) == FILE_B
- && ( pos.piece_on(relative_square(us, SQ_A1)) == rook_of_color(them)
- || pos.piece_on(relative_square(us, SQ_A1)) == queen_of_color(them)))
+ && ( pos.piece_on(relative_square(us, SQ_A1)) == piece_of_color_and_type(them, ROOK)
+ || pos.piece_on(relative_square(us, SQ_A1)) == piece_of_color_and_type(them, QUEEN)))
illegal = true;
if (!illegal)