Order bad captures by MVV/LVA

[stockfish] / src / move.cpp

diff --git a/src/move.cpp b/src/move.cpp
index 7b8c4fcc62634e8eb086f867c3c6d0ee4d2a9fbf..e52a8e59e688853fad3557314e5850da63b62d71 100644 (file)
--- a/src/move.cpp
+++ b/src/move.cpp
@@ -18,7 +18,6 @@
 */
 
 #include <cassert>
-#include <cstring>
 #include <string>
 
 #include "movegen.h"
@@ -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;
 }