X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fnotation.cpp;h=d017c0790cc801b42842b949eb9c2c85d210e788;hp=2b4174ef0e5f817f9bbcb215cd140d247a06aa7c;hb=13d1f0ae4301b86c610a58332c3c19d9101704da;hpb=c5ec94d0f1b128fc2c691c7231663a345409d5cc diff --git a/src/notation.cpp b/src/notation.cpp index 2b4174ef..d017c079 100644 --- a/src/notation.cpp +++ b/src/notation.cpp @@ -89,9 +89,9 @@ Move move_from_uci(const Position& pos, string& str) { if (str.length() == 5) // Junior could send promotion piece in uppercase str[4] = char(tolower(str[4])); - for (MoveList ml(pos); !ml.end(); ++ml) - if (str == move_to_uci(ml.move(), pos.is_chess960())) - return ml.move(); + for (MoveList it(pos); *it; ++it) + if (str == move_to_uci(*it, pos.is_chess960())) + return *it; return MOVE_NONE; } @@ -133,7 +133,7 @@ const string move_to_san(Position& pos, Move m) { while (b) { Move move = make_move(pop_lsb(&b), to); - if (!pos.pl_move_is_legal(move, pos.pinned_pieces())) + if (!pos.legal(move, pos.pinned_pieces(pos.side_to_move()))) others ^= from_sq(move); } @@ -149,10 +149,10 @@ const string move_to_san(Position& pos, Move m) { san += square_to_string(from); } } - else if (pos.is_capture(m)) + else if (pos.capture(m)) san = file_to_char(file_of(from)); - if (pos.is_capture(m)) + if (pos.capture(m)) san += 'x'; san += square_to_string(to); @@ -161,7 +161,7 @@ const string move_to_san(Position& pos, Move m) { san += string("=") + PieceToChar[WHITE][promotion_type(m)]; } - if (pos.move_gives_check(m, CheckInfo(pos))) + if (pos.gives_check(m, CheckInfo(pos))) { StateInfo st; pos.do_move(m, st); @@ -207,7 +207,7 @@ static string score_to_string(Value v) { s << "-#" << (VALUE_MATE + v) / 2; else - s << setprecision(2) << fixed << showpos << float(v) / PawnValueMg; + s << setprecision(2) << fixed << showpos << double(v) / PawnValueMg; return s.str(); }