X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fmove.cpp;h=62ec7579659817cc6233700f0a44ea9c41f9b3f6;hb=1b2af05ea69abffff432f7f20685e144bd24055e;hp=7b8c4fcc62634e8eb086f867c3c6d0ee4d2a9fbf;hpb=67338e6f322b8f8ec0d897815e16a87937efc9b0;p=stockfish
diff --git a/src/move.cpp b/src/move.cpp
index 7b8c4fcc..62ec7579 100644
--- a/src/move.cpp
+++ b/src/move.cpp
@@ -17,8 +17,8 @@
along with this program. If not, see .
*/
+#include
#include
-#include
#include
#include "movegen.h"
@@ -47,7 +47,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;
}
@@ -57,7 +57,10 @@ const string move_to_uci(Move m, bool chess960) {
/// simple coordinate notation and returns an equivalent Move if any.
/// Moves are guaranteed to be legal.
-Move move_from_uci(const Position& pos, const string& str) {
+Move move_from_uci(const Position& pos, string str) {
+
+ // Some GUIs, like Junior, could send promotion in uppercase
+ std::transform(str.begin(), str.end(), str.begin(), tolower);
for (MoveList ml(pos); !ml.end(); ++ml)
if (str == move_to_uci(ml.move(), pos.is_chess960()))
@@ -85,7 +88,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,8 +101,8 @@ 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 = pos.attackers_to(to) & pos.pieces(pos.side_to_move(), pt);
+ attackers ^= from;
ambiguousMove = ambiguousFile = ambiguousRank = false;
while (attackers)
@@ -143,17 +146,17 @@ 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));
}
}
- // 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(pos).size() ? "+" : "#";
+ pos.undo_move(m);
+ }
return san;
}