X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmove.h;h=d014dc7775bae101542f12cc0080d50c49240bc6;hp=299379e2003b57f8375435e90e7fbf7059148ff5;hb=155bed18f5224d401ddf5b4b71d93d8a8c379b3c;hpb=c9d7e99de682516c560009b550c41da9ae2008b8

diff --git a/src/move.h b/src/move.h
index 299379e2..d014dc77 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) {
@@ -153,32 +153,24 @@ inline int move_is_castle(Move m) {
   return (m & (3 << 14)) == (3 << 14);
 }
 
-inline bool move_is_short_castle(Move m) {
-  return move_is_castle(m) && (move_to(m) > move_from(m));
-}
-
-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) | (1 << 14) | ((promotion - 2) << 12)) ;
 }
 
 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) {