- Square rsq = (Side == KING_SIDE ? pos.initial_kr_square(us) : pos.initial_qr_square(us));
- Square s1 = relative_square(us, Side == KING_SIDE ? SQ_G1 : SQ_C1);
- Square s2 = relative_square(us, Side == KING_SIDE ? SQ_F1 : SQ_D1);
- Square s;
- bool illegal = false;
-
- assert(pos.piece_on(rsq) == make_piece(us, ROOK));
-
- // It is a bit complicated to correctly handle Chess960
- for (s = Min(ksq, s1); s <= Max(ksq, s1); s++)
- if ( (s != ksq && s != rsq && pos.square_is_occupied(s))
- ||(pos.attackers_to(s) & pos.pieces_of_color(them)))
- illegal = true;
+ // After castling, the rook and king's final positions are exactly the same
+ // in Chess960 as they would be in standard chess.
+ Square kfrom = pos.king_square(us);
+ Square rfrom = pos.castle_rook_square(f);
+ Square kto = relative_square(us, Side == KING_SIDE ? SQ_G1 : SQ_C1);
+ Square rto = relative_square(us, Side == KING_SIDE ? SQ_F1 : SQ_D1);
+
+ assert(!pos.in_check());
+ assert(pos.piece_on(kfrom) == make_piece(us, KING));
+ assert(pos.piece_on(rfrom) == make_piece(us, ROOK));
+
+ // Unimpeded rule: All the squares between the king's initial and final squares
+ // (including the final square), and all the squares between the rook's initial
+ // and final squares (including the final square), must be vacant except for
+ // the king and castling rook.
+ for (Square s = Min(kfrom, kto); s <= Max(kfrom, kto); s++)
+ if ( (s != kfrom && s != rfrom && !pos.square_is_empty(s))
+ ||(pos.attackers_to(s) & pos.pieces(them)))
+ return mlist;