X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftypes.h;h=5002ece8c8dd202bd0fcf7a12bbd1c35d6f38368;hp=f041e29db5102c7defa5ad8a250d20b2309d76c4;hb=1d1b7df7c6b3496d1a3fe926cadf25d91e1558f6;hpb=13b9e1e09811560d0120a8586c7418fb3640d626 diff --git a/src/types.h b/src/types.h index f041e29d..5002ece8 100644 --- a/src/types.h +++ b/src/types.h @@ -124,20 +124,20 @@ enum CastlingSide { KING_SIDE, QUEEN_SIDE, CASTLING_SIDE_NB = 2 }; -enum CastlingFlag { // Defined as in PolyGlot book hash key +enum CastlingRight { // Defined as in PolyGlot book hash key NO_CASTLING, WHITE_OO, WHITE_OOO = WHITE_OO << 1, BLACK_OO = WHITE_OO << 2, BLACK_OOO = WHITE_OO << 3, ANY_CASTLING = WHITE_OO | WHITE_OOO | BLACK_OO | BLACK_OOO, - CASTLING_FLAG_NB = 16 + CASTLING_RIGHT_NB = 16 }; template struct MakeCastling { - static const CastlingFlag - flag = C == WHITE ? S == QUEEN_SIDE ? WHITE_OOO : WHITE_OO - : S == QUEEN_SIDE ? BLACK_OOO : BLACK_OO; + static const CastlingRight + right = C == WHITE ? S == QUEEN_SIDE ? WHITE_OOO : WHITE_OO + : S == QUEEN_SIDE ? BLACK_OOO : BLACK_OO; }; enum Phase { @@ -341,8 +341,8 @@ inline Square operator|(File f, Rank r) { return Square((r << 3) | f); } -inline CastlingFlag operator|(Color c, CastlingSide s) { - return CastlingFlag(WHITE_OO << ((s == QUEEN_SIDE) + 2 * c)); +inline CastlingRight operator|(Color c, CastlingSide s) { + return CastlingRight(WHITE_OO << ((s == QUEEN_SIDE) + 2 * c)); } inline Value mate_in(int ply) {