// Update piece list, move the last piece at index[capsq] position
//
- // WARNING: this is a not perfectly revresible operation. When we
+ // WARNING: This is a not perfectly revresible operation. When we
// will reinsert the captured piece in undo_move() we will put it
// at the end of the list and not in its original place, it means
// index[] and pieceList[] are not guaranteed to be invariant to a
// Locate the least valuable attacker to the destination square
// and use it to initialize from square.
+ stmAttackers = attackers & pieces_of_color(us);
PieceType pt;
- for (pt = PAWN; !(attackers & pieces_of_color_and_type(us, pt)); pt++)
+ for (pt = PAWN; !(stmAttackers & pieces_of_type(pt)); pt++)
assert(pt < KING);
- from = first_1(attackers & pieces_of_color_and_type(us, pt));
+ from = first_1(stmAttackers & pieces_of_type(pt));
piece = piece_on(from);
}
for (Color c = WHITE; c <= BLACK; c++)
for (PieceType pt = PAWN; pt <= KING; pt++)
{
- b = pieces_of_color_and_type(c, pt);
+ b = pieces_of_color(c) & pieces_of_type(pt);
while(b)
{
s = pop_1st_bit(&b);
for (PieceType pt = KNIGHT; pt <= QUEEN; pt++)
{
- Bitboard b = pieces_of_color_and_type(c, pt);
+ Bitboard b = pieces_of_color(c) & pieces_of_type(pt);
while (b)
{
assert(piece_on(first_1(b)) == piece_of_color_and_type(c, pt));
if (debugPieceCounts)
for (Color c = WHITE; c <= BLACK; c++)
for (PieceType pt = PAWN; pt <= KING; pt++)
- if (pieceCount[c][pt] != count_1s(pieces_of_color_and_type(c, pt)))
+ if (pieceCount[c][pt] != count_1s(pieces_of_color(c) & pieces_of_type(pt)))
return false;
if (failedStep) (*failedStep)++;
for(PieceType pt = PAWN; pt <= KING; pt++)
for(int i = 0; i < pieceCount[c][pt]; i++)
{
- if (piece_on(piece_list(c, pt, i)) != piece_of_color_and_type(c, pt))
+ if (piece_on(piece_list(c, pt, i)) != (pieces_of_color(c) & pieces_of_type(pt)))
return false;
if (index[piece_list(c, pt, i)] != i)