/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008 Marco Costalba
+ Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "move.h"
#include "piece.h"
#include "position.h"
-#include "ucioption.h"
////
}
}
- if (piece == king_of_color(us))
+ if (piece == piece_of_color_and_type(us, KING))
{
// Is this a castling move? A king move is assumed to be a castling
// move if the destination square is occupied by a friendly rook, or
// if the distance between the source and destination squares is more
// than 1.
- if (pos.piece_on(to) == rook_of_color(us))
+ if (pos.piece_on(to) == piece_of_color_and_type(us, ROOK))
return make_castle_move(from, to);
else if (square_distance(from, to) > 1)
// internal "king captures rook" representation.
SquareDelta delta = (to > from ? DELTA_E : DELTA_W);
Square s = from + delta;
- while (relative_rank(us, s) == RANK_1 && pos.piece_on(s) != rook_of_color(us))
+ while (relative_rank(us, s) == RANK_1 && pos.piece_on(s) != piece_of_color_and_type(us, ROOK))
s += delta;
return (relative_rank(us, s) == RANK_1 ? make_castle_move(from, s) : MOVE_NONE);
}
}
- else if (piece == pawn_of_color(us))
+ else if (piece == piece_of_color_and_type(us, PAWN))
{
// En passant move? We assume that a pawn move is an en passant move
// without further testing if the destination square is epSquare.
/// move_to_string() converts a move to a string in coordinate notation
-/// (g1f3, a7a8q, etc.). The only special case is castling moves, where we
+/// (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.
-const std::string move_to_string(Move move) {
+const std::string move_to_string(Move move, bool chess960) {
std::string str;
Square from = move_from(move);
str = "0000";
else
{
- if (!Chess960)
- {
- if (move_is_short_castle(move))
- return (from == SQ_E1 ? "e1g1" : "e8g8");
+ if (move_is_short_castle(move) && !chess960)
+ return (from == SQ_E1 ? "e1g1" : "e8g8");
+
+ if (move_is_long_castle(move) && !chess960)
+ return (from == SQ_E1 ? "e1c1" : "e8c8");
- if (move_is_long_castle(move))
- return (from == SQ_E1 ? "e1c1" : "e8c8");
- }
str = square_to_string(from) + square_to_string(to);
- if (move_promotion(move))
- str += piece_type_to_char(move_promotion(move), false);
+ if (move_is_promotion(move))
+ str += piece_type_to_char(move_promotion_piece(move), false);
}
return str;
}
/// Overload the << operator, to make it easier to print moves.
-std::ostream &operator << (std::ostream &os, Move m) {
+std::ostream& operator << (std::ostream& os, Move m) {
- return os << move_to_string(m);
+ bool chess960 = (os.iword(0) != 0); // See set960()
+ return os << move_to_string(m, chess960);
}