/// move_to_uci() converts a move to a string in coordinate notation
/// (g1f3, a7a8q, etc.). The only special case is castling moves, where we
/// print in the e1g1 notation in normal chess mode, and in e1h1 notation in
-/// Chess960 mode.
+/// Chess960 mode. Instead internally Move is coded as "king captures rook".
const string move_to_uci(Move m, bool chess960) {
if (m == MOVE_NULL)
return "0000";
- if (move_is_short_castle(m) && !chess960)
- return from == SQ_E1 ? "e1g1" : "e8g8";
-
- if (move_is_long_castle(m) && !chess960)
- return from == SQ_E1 ? "e1c1" : "e8c8";
+ if (move_is_castle(m) && !chess960)
+ to = from + (square_file(to) == FILE_H ? Square(2) : -Square(2));
if (move_is_promotion(m))
promotion = char(tolower(piece_type_to_char(promotion_piece_type(m))));
if (m == MOVE_NULL)
return "(null)";
- if (move_is_long_castle(m))
- san = "O-O-O";
- else if (move_is_short_castle(m))
- san = "O-O";
+ if (move_is_castle(m))
+ san = (move_to(m) < move_from(m) ? "O-O-O" : "O-O");
else
{
if (pt != PAWN)
return (m & (3 << 14)) == (3 << 14);
}
-inline bool move_is_short_castle(Move m) {
- return move_is_castle(m) && (move_to(m) > move_from(m));
-}
-
-inline bool move_is_long_castle(Move m) {
- return move_is_castle(m) && (move_to(m) < move_from(m));
-}
-
inline PieceType promotion_piece_type(Move m) {
return PieceType(((m >> 12) & 3) + 2);
}
}
inline Move make_promotion_move(Square from, Square to, PieceType promotion) {
- return Move(to | (from << 6) | ((promotion - 2) << 12) | (1 << 14));
+ return Move(to | (from << 6) | (1 << 14) | ((promotion - 2) << 12)) ;
}
inline Move make_ep_move(Square from, Square to) {
void operator++() { cur++; }
bool end() const { return cur == last; }
Move move() const { return cur->move; }
- int size() const { return last - mlist; }
+ int size() const { return int(last - mlist); }
private:
MoveStack mlist[MAX_MOVES];