X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmove.cpp;h=4b1285e4df795c66971f30e40e17b93ddd3e0612;hp=7b8c4fcc62634e8eb086f867c3c6d0ee4d2a9fbf;hb=875a8079bc142ca92027b07427d72c03fe5268a5;hpb=67338e6f322b8f8ec0d897815e16a87937efc9b0

diff --git a/src/move.cpp b/src/move.cpp
index 7b8c4fcc..4b1285e4 100644
--- a/src/move.cpp
+++ b/src/move.cpp
@@ -18,7 +18,6 @@
 */
 
 #include <cassert>
-#include <cstring>
 #include <string>
 
 #include "movegen.h"
@@ -99,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);
+          xor_bit(&attackers, from);
           ambiguousMove = ambiguousFile = ambiguousRank = false;
 
           while (attackers)
@@ -147,13 +146,13 @@ const string move_to_san(Position& pos, Move m) {
       }
   }
 
-  // The move gives check? We don't use pos.move_gives_check() here
-  // because we need to test for a mate after the move is done.
-  StateInfo st;
-  pos.do_move(m, st);
-  if (pos.in_check())
-      san += pos.is_mate() ? "#" : "+";
-  pos.undo_move(m);
+  if (pos.move_gives_check(m, CheckInfo(pos)))
+  {
+      StateInfo st;
+      pos.do_move(m, st);
+      san += MoveList<MV_LEGAL>(pos).size() ? "+" : "#";
+      pos.undo_move(m);
+  }
 
   return san;
 }