X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpiece.h;h=40a01e1005401ee7c807c22746484f77945b52ad;hp=5605f4b6876671bd7f81f06614eb85e29d1e52dc;hb=13bd0cff0d1f7977ee68cf995d2b5f84159974ba;hpb=f205fe1fe503fe2eae8167225393e0abdd635042 diff --git a/src/piece.h b/src/piece.h index 5605f4b6..40a01e10 100644 --- a/src/piece.h +++ b/src/piece.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2009 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 @@ -34,14 +34,13 @@ //// enum PieceType { - NO_PIECE_TYPE = 0, + PIECE_TYPE_NONE = 0, PAWN = 1, KNIGHT = 2, BISHOP = 3, ROOK = 4, QUEEN = 5, KING = 6 }; enum Piece { - 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 + PIECE_NONE_DARK_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, PIECE_NONE = 16 }; @@ -58,15 +57,6 @@ const int SlidingArray[18] = { //// Inline functions //// -inline Piece operator+ (Piece p, int i) { return Piece(int(p) + i); } -inline void operator++ (Piece &p, int) { p = Piece(int(p) + 1); } -inline Piece operator- (Piece p, int i) { return Piece(int(p) - i); } -inline void operator-- (Piece &p, int) { p = Piece(int(p) - 1); } -inline PieceType operator+ (PieceType p, int i) {return PieceType(int(p) + i);} -inline void operator++ (PieceType &p, int) { p = PieceType(int(p) + 1); } -inline PieceType operator- (PieceType p, int i) {return PieceType(int(p) - i);} -inline void operator-- (PieceType &p, int) { p = PieceType(int(p) - 1); } - inline PieceType type_of_piece(Piece p) { return PieceType(int(p) & 7); }