namespace {
template<CastlingSide Side, bool Checks, bool Chess960>
- ExtMove* generate_castle(const Position& pos, ExtMove* mlist, Color us) {
+ ExtMove* generate_castling(const Position& pos, ExtMove* mlist, Color us) {
- if (pos.castle_impeded(us, Side) || !pos.can_castle(make_castle_right(us, Side)))
+ if (pos.castling_impeded(us, Side) || !pos.can_castle(make_castling_flag(us, Side)))
return mlist;
// After castling, the rook and king final positions are the same in Chess960
// as they would be in standard chess.
Square kfrom = pos.king_square(us);
- Square rfrom = pos.castle_rook_square(us, Side);
+ Square rfrom = pos.castling_rook_square(us, Side);
Square kto = relative_square(us, Side == KING_SIDE ? SQ_G1 : SQ_C1);
Bitboard enemies = pos.pieces(~us);
if (Chess960 && (attacks_bb<ROOK>(kto, pos.pieces() ^ rfrom) & pos.pieces(~us, ROOK, QUEEN)))
return mlist;
- (mlist++)->move = make<CASTLE>(kfrom, rfrom);
+ (mlist++)->move = make<CASTLING>(kfrom, rfrom);
if (Checks && !pos.gives_check((mlist - 1)->move, CheckInfo(pos)))
--mlist;
{
if (pos.is_chess960())
{
- mlist = generate_castle< KING_SIDE, Checks, true>(pos, mlist, Us);
- mlist = generate_castle<QUEEN_SIDE, Checks, true>(pos, mlist, Us);
+ mlist = generate_castling< KING_SIDE, Checks, true>(pos, mlist, Us);
+ mlist = generate_castling<QUEEN_SIDE, Checks, true>(pos, mlist, Us);
}
else
{
- mlist = generate_castle< KING_SIDE, Checks, false>(pos, mlist, Us);
- mlist = generate_castle<QUEEN_SIDE, Checks, false>(pos, mlist, Us);
+ mlist = generate_castling< KING_SIDE, Checks, false>(pos, mlist, Us);
+ mlist = generate_castling<QUEEN_SIDE, Checks, false>(pos, mlist, Us);
}
}