X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmove.cpp;h=fdc6946b7dd9aaf2e53a5e286785c492a0c327eb;hp=e52a8e59e688853fad3557314e5850da63b62d71;hb=ef0496ff4095330eaea4b33bb14e0386942fd093;hpb=2a21543c88f82a64ee48d00d706db102c0c4637d

diff --git a/src/move.cpp b/src/move.cpp
index e52a8e59..fdc6946b 100644
--- a/src/move.cpp
+++ b/src/move.cpp
@@ -46,7 +46,7 @@ const string move_to_uci(Move m, bool chess960) {
       to = from + (file_of(to) == FILE_H ? Square(2) : -Square(2));
 
   if (is_promotion(m))
-      promotion = char(tolower(piece_type_to_char(promotion_piece_type(m))));
+      promotion = char(tolower(piece_type_to_char(promotion_type(m))));
 
   return square_to_string(from) + square_to_string(to) + promotion;
 }
@@ -84,7 +84,7 @@ const string move_to_san(Position& pos, Move m) {
   bool ambiguousMove, ambiguousFile, ambiguousRank;
   Square sq, from = from_sq(m);
   Square to = to_sq(m);
-  PieceType pt = type_of(pos.piece_on(from));
+  PieceType pt = type_of(pos.piece_moved(m));
   string san;
 
   if (is_castle(m))
@@ -98,7 +98,7 @@ const string move_to_san(Position& pos, Move m) {
           // Disambiguation if we have more then one piece with destination 'to'
           // note that for pawns is not needed because starting file is explicit.
           attackers = pos.attackers_to(to) & pos.pieces(pt, pos.side_to_move());
-          clear_bit(&attackers, from);
+          attackers ^= from;
           ambiguousMove = ambiguousFile = ambiguousRank = false;
 
           while (attackers)
@@ -142,7 +142,7 @@ const string move_to_san(Position& pos, Move m) {
       if (is_promotion(m))
       {
           san += '=';
-          san += piece_type_to_char(promotion_piece_type(m));
+          san += piece_type_to_char(promotion_type(m));
       }
   }