And remove not used OUTSIDE enum Piece.
No functional change.
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
- NO_PIECE = 0, WP = 1, WN = 2, WB = 3, WR = 4, WQ = 5, WK = 6,
- BP = 9, BN = 10, BB = 11, BR = 12, BQ = 13, BK = 14,
- EMPTY = 16, OUTSIDE = 17
+ EMPTY_BLACK_SQ = 0, WP = 1, WN = 2, WB = 3, WR = 4, WQ = 5, WK = 6,
+ BP = 9, BN = 10, BB = 11, BR = 12, BQ = 13, BK = 14, EMPTY = 16
operator[]('B') = WB; operator[]('b') = BB;
operator[]('N') = WN; operator[]('n') = BN;
operator[]('P') = WP; operator[]('p') = BP;
operator[]('B') = WB; operator[]('b') = BB;
operator[]('N') = WN; operator[]('n') = BN;
operator[]('P') = WP; operator[]('p') = BP;
+ operator[](' ') = EMPTY; operator[]('.') = EMPTY_BLACK_SQ;
}
char from_piece(Piece p) const {
}
char from_piece(Piece p) const {
Score Position::PieceSquareTable[16][64];
Score Position::PieceSquareTable[16][64];
-static bool RequestPending = false;
static PieceLetters pieceLetters;
static PieceLetters pieceLetters;
/// Position::print() prints an ASCII representation of the position to
/// the standard output. If a move is given then also the san is print.
/// Position::print() prints an ASCII representation of the position to
/// the standard output. If a move is given then also the san is print.
-void Position::print(Move m) const {
+void Position::print(Move move) const {
- static const string pieceLetters = " PNBRQK PNBRQK .";
+ const char* dottedLine = "\n+---+---+---+---+---+---+---+---+\n";
+ static bool requestPending = false;
// Check for reentrancy, as example when called from inside
// MovePicker that is used also here in move_to_san()
// Check for reentrancy, as example when called from inside
// MovePicker that is used also here in move_to_san()
- cout << endl;
- if (m != MOVE_NONE)
{
Position p(*this, thread());
{
Position p(*this, thread());
- string col = (color_of_piece_on(move_from(m)) == BLACK ? ".." : "");
- cout << "Move is: " << col << move_to_san(p, m) << endl;
+ string dd = (color_of_piece_on(move_from(move)) == BLACK ? ".." : "");
+ cout << "\nMove is: " << dd << move_to_san(p, move);
for (Rank rank = RANK_8; rank >= RANK_1; rank--)
{
for (Rank rank = RANK_8; rank >= RANK_1; rank--)
{
- cout << "+---+---+---+---+---+---+---+---+" << endl;
+ cout << dottedLine << '|';
for (File file = FILE_A; file <= FILE_H; file++)
{
Square sq = make_square(file, rank);
for (File file = FILE_A; file <= FILE_H; file++)
{
Square sq = make_square(file, rank);
+ char c = (color_of_piece_on(sq) == BLACK ? '=' : ' ');
Piece piece = piece_on(sq);
Piece piece = piece_on(sq);
- if (piece == EMPTY && square_color(sq) == WHITE)
- piece = NO_PIECE;
- char col = (color_of_piece_on(sq) == BLACK ? '=' : ' ');
- cout << '|' << col << pieceLetters[piece] << col;
+ if (piece == EMPTY && square_color(sq) == BLACK)
+ piece = EMPTY_BLACK_SQ;
+
+ cout << c << pieceLetters.from_piece(piece) << c << '|';
- cout << "+---+---+---+---+---+---+---+---+" << endl
- << "Fen is: " << to_fen() << endl
- << "Key is: " << st->key << endl;
-
- RequestPending = false;
+ cout << dottedLine << "Fen is: " << to_fen() << "\nKey is: " << st->key << endl;
+ requestPending = false;