X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmove.cpp;h=247f8a2abe218a3af10339bb095e84ffe97ff60a;hp=060e206bfd36a3e2bc081eca2242074da2e3a594;hb=95d9687d95e5aa540c58e673300ef911164c90e0;hpb=ff41b8df764b352b450af572fa98097343b3f808

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)