- // Pieces moves
- mlist = generate_piece_checks<PAWN>(pos, mlist, us, dc, ksq);
- mlist = generate_piece_checks<KNIGHT>(pos, mlist, us, dc, ksq);
- mlist = generate_piece_checks<BISHOP>(pos, mlist, us, dc, ksq);
- mlist = generate_piece_checks<ROOK>(pos, mlist, us, dc, ksq);
- mlist = generate_piece_checks<QUEEN>(pos, mlist, us, dc, ksq);
- mlist = generate_piece_checks<KING>(pos, mlist, us, dc, ksq);
-
- // Castling moves that give check. Very rare but nice to have!
- if ( pos.can_castle_queenside(us)
- && (square_rank(ksq) == square_rank(pos.king_square(us)) || square_file(ksq) == FILE_D)
- && castling_is_check(pos, QUEEN_SIDE))
- mlist = generate_castle_moves<QUEEN_SIDE>(pos, mlist);
-
- if ( pos.can_castle_kingside(us)
- && (square_rank(ksq) == square_rank(pos.king_square(us)) || square_file(ksq) == FILE_F)
- && castling_is_check(pos, KING_SIDE))
- mlist = generate_castle_moves<KING_SIDE>(pos, mlist);
-
- return mlist;
+ // Discovered non-capture checks
+ b = dc = pos.discovered_check_candidates(us);
+
+ while (b)
+ {
+ from = pop_1st_bit(&b);
+ switch (pos.type_of_piece_on(from))
+ {
+ case PAWN: /* Will be generated togheter with pawns direct checks */ break;
+ case KNIGHT: mlist = generate_discovered_checks<KNIGHT>(pos, mlist, from); break;
+ case BISHOP: mlist = generate_discovered_checks<BISHOP>(pos, mlist, from); break;
+ case ROOK: mlist = generate_discovered_checks<ROOK>(pos, mlist, from); break;
+ case KING: mlist = generate_discovered_checks<KING>(pos, mlist, from); break;
+ default: assert(false); break;
+ }
+ }
+
+ // Direct non-capture checks
+ mlist = generate_direct_checks<PAWN>(pos, mlist, us, dc, ksq);
+ mlist = generate_direct_checks<KNIGHT>(pos, mlist, us, dc, ksq);
+ mlist = generate_direct_checks<BISHOP>(pos, mlist, us, dc, ksq);
+ mlist = generate_direct_checks<ROOK>(pos, mlist, us, dc, ksq);
+ return generate_direct_checks<QUEEN>(pos, mlist, us, dc, ksq);