From 95d9687d95e5aa540c58e673300ef911164c90e0 Mon Sep 17 00:00:00 2001
From: Marco Costalba <mcostalba@gmail.com>
Date: Sun, 3 Jul 2011 10:08:09 +0100
Subject: [PATCH] Retire move_is_short_castle() and move_is_long_castle()

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
---
 src/move.cpp  | 15 +++++----------
 src/move.h    | 10 +---------
 src/movegen.h |  2 +-
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/move.cpp b/src/move.cpp
index 060e206b..247f8a2a 100644
--- a/src/move.cpp
+++ b/src/move.cpp
@@ -38,7 +38,7 @@ namespace {
 /// move_to_uci() converts a move to a string in coordinate notation
 /// (g1f3, a7a8q, etc.). The only special case is castling moves, where we
 /// print in the e1g1 notation in normal chess mode, and in e1h1 notation in
-/// Chess960 mode.
+/// Chess960 mode. Instead internally Move is coded as "king captures rook".
 
 const string move_to_uci(Move m, bool chess960) {
 
@@ -52,11 +52,8 @@ const string move_to_uci(Move m, bool chess960) {
   if (m == MOVE_NULL)
       return "0000";
 
-  if (move_is_short_castle(m) && !chess960)
-      return from == SQ_E1 ? "e1g1" : "e8g8";
-
-  if (move_is_long_castle(m) && !chess960)
-      return from == SQ_E1 ? "e1c1" : "e8c8";
+  if (move_is_castle(m) && !chess960)
+      to = from + (square_file(to) == FILE_H ? Square(2) : -Square(2));
 
   if (move_is_promotion(m))
       promotion = char(tolower(piece_type_to_char(promotion_piece_type(m))));
@@ -101,10 +98,8 @@ const string move_to_san(Position& pos, Move m) {
   if (m == MOVE_NULL)
       return "(null)";
 
-  if (move_is_long_castle(m))
-      san = "O-O-O";
-  else if (move_is_short_castle(m))
-      san = "O-O";
+  if (move_is_castle(m))
+      san = (move_to(m) < move_from(m) ? "O-O-O" : "O-O");
   else
   {
       if (pt != PAWN)
diff --git a/src/move.h b/src/move.h
index 42d3bbe9..d014dc77 100644
--- a/src/move.h
+++ b/src/move.h
@@ -153,14 +153,6 @@ 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 promotion_piece_type(Move m) {
   return PieceType(((m >> 12) & 3) + 2);
 }
@@ -170,7 +162,7 @@ inline Move make_move(Square from, Square to) {
 }
 
 inline Move make_promotion_move(Square from, Square to, PieceType promotion) {
-  return Move(to | (from << 6) | ((promotion - 2) << 12) | (1 << 14));
+  return Move(to | (from << 6) | (1 << 14) | ((promotion - 2) << 12)) ;
 }
 
 inline Move make_ep_move(Square from, Square to) {
diff --git a/src/movegen.h b/src/movegen.h
index 4e58d0ff..fdac5d0b 100644
--- a/src/movegen.h
+++ b/src/movegen.h
@@ -43,7 +43,7 @@ struct MoveList {
   void operator++() { cur++; }
   bool end() const { return cur == last; }
   Move move() const { return cur->move; }
-  int size() const { return last - mlist; }
+  int size() const { return int(last - mlist); }
 
 private:
   MoveStack mlist[MAX_MOVES];
-- 
2.39.2