X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmove.cpp;h=8cc0c004dac94bd27171ddefab6ce77d0baedce2;hp=060e206bfd36a3e2bc081eca2242074da2e3a594;hb=ad1f28bc1c1c5426fb8ab246f5d43ad57002b4d5;hpb=53ccba8457231677897f531ff283136edc550cf2

diff --git a/src/move.cpp b/src/move.cpp
index 060e206b..8cc0c004 100644
--- a/src/move.cpp
+++ b/src/move.cpp
@@ -25,7 +25,7 @@
 
 #include "move.h"
 #include "movegen.h"
-#include "search.h"
+#include "position.h"
 
 using std::string;
 
@@ -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))));
@@ -80,12 +77,17 @@ Move move_from_uci(const Position& pos, const string& str) {
 
 
 /// move_to_san() takes a position and a move as input, where it is assumed
-/// that the move is a legal move from the position. The return value is
+/// that the move is a legal move for the position. The return value is
 /// a string containing the move in short algebraic notation.
 
 const string move_to_san(Position& pos, Move m) {
 
-  assert(pos.is_ok());
+  if (m == MOVE_NONE)
+      return "(none)";
+
+  if (m == MOVE_NULL)
+      return "(null)";
+
   assert(move_is_ok(m));
 
   Bitboard attackers;
@@ -95,16 +97,8 @@ const string move_to_san(Position& pos, Move m) {
   PieceType pt = piece_type(pos.piece_on(from));
   string san;
 
-  if (m == MOVE_NONE)
-      return "(none)";
-
-  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)