X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmove.h;h=42d3bbe9750d31e55993911d6c72f704d255d12f;hp=299379e2003b57f8375435e90e7fbf7059148ff5;hb=b21a5e2f0638a55daeaa98ba95afc6c016ea0b6e;hpb=c9d7e99de682516c560009b550c41da9ae2008b8 diff --git a/src/move.h b/src/move.h index 299379e2..42d3bbe9 100644 --- a/src/move.h +++ b/src/move.h @@ -130,7 +130,7 @@ inline T pick_best(T* curMove, T* lastMove) inline Square move_from(Move m) { - return Square((int(m) >> 6) & 0x3F); + return Square((m >> 6) & 0x3F); } inline Square move_to(Move m) { @@ -161,24 +161,24 @@ inline bool move_is_long_castle(Move m) { return move_is_castle(m) && (move_to(m) < move_from(m)); } -inline PieceType move_promotion_piece(Move m) { - return move_is_promotion(m) ? PieceType(((int(m) >> 12) & 3) + 2) : PIECE_TYPE_NONE; +inline PieceType promotion_piece_type(Move m) { + return PieceType(((m >> 12) & 3) + 2); } inline Move make_move(Square from, Square to) { - return Move(int(to) | (int(from) << 6)); + return Move(to | (from << 6)); } inline Move make_promotion_move(Square from, Square to, PieceType promotion) { - return Move(int(to) | (int(from) << 6) | ((int(promotion) - 2) << 12) | (1 << 14)); + return Move(to | (from << 6) | ((promotion - 2) << 12) | (1 << 14)); } inline Move make_ep_move(Square from, Square to) { - return Move(int(to) | (int(from) << 6) | (2 << 14)); + return Move(to | (from << 6) | (2 << 14)); } inline Move make_castle_move(Square from, Square to) { - return Move(int(to) | (int(from) << 6) | (3 << 14)); + return Move(to | (from << 6) | (3 << 14)); } inline bool move_is_ok(Move m) {