using namespace std;
-static const char* PieceToChar = " PNBRQK pnbrqk";
+static const char* PieceToChar = " PNBRQK pnbrqk";
/// score_to_uci() converts a value to a string suitable for use with the UCI
stringstream s;
if (abs(v) < VALUE_MATE_IN_MAX_PLY)
- s << "cp " << v * 100 / int(PawnValueMidgame);
+ s << "cp " << v * 100 / int(PawnValueMg);
else
s << "mate " << (v > 0 ? VALUE_MATE - v + 1 : -VALUE_MATE - v) / 2;
string move = square_to_string(from) + square_to_string(to);
if (type_of(m) == PROMOTION)
- move += PieceToChar[promotion_type(m) + 7]; // Lower case
+ move += PieceToChar[make_piece(BLACK, promotion_type(m))]; // Lower case
return move;
}
Square from = from_sq(m);
Square to = to_sq(m);
Piece pc = pos.piece_on(from);
+ PieceType pt = type_of(pc);
if (type_of(m) == CASTLE)
san = to > from ? "O-O" : "O-O-O";
else
{
- if (type_of(pc) != PAWN)
+ if (pt != PAWN)
{
- san = PieceToChar[pc];
+ san = PieceToChar[pt]; // Upper case
// Disambiguation if we have more then one piece with destination 'to'
// note that for pawns is not needed because starting file is explicit.
ambiguousMove = ambiguousFile = ambiguousRank = false;
- attackers = (pos.attacks_from(pc, to) & pos.pieces(us)) ^ from;
+ attackers = (pos.attacks_from(pc, to) & pos.pieces(us, pt)) ^ from;
while (attackers)
{
s << "-#" << (VALUE_MATE + v) / 2;
else
- s << setprecision(2) << fixed << showpos << float(v) / PawnValueMidgame;
+ s << setprecision(2) << fixed << showpos << float(v) / PawnValueMg;
return s.str();
}