X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.cpp;h=605cc1ae63f3e63c0f4bd0f13cc68b40b0b979cb;hp=0a04b99b1ac9d1be07bd11ae0430848a7344449c;hb=bc76c62c6302a445860e1deef5f55c2aabb7377d;hpb=b5bbc1f71359e2bee21915e724c490898ba41a86 diff --git a/src/position.cpp b/src/position.cpp index 0a04b99b..605cc1ae 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -174,18 +174,41 @@ void Position::from_fen(const string& fenStr, bool isChess960) { sideToMove = (token == 'w' ? WHITE : BLACK); fen >> token; - // 3. Castling availability + // 3. Castling availability. Compatible with 3 standards: Normal FEN standard, + // Shredder-FEN that uses the letters of the columns on which the rooks began + // the game instead of KQkq and also X-FEN standard that, in case of Chess960, + // if an inner rook is associated with the castling right, the castling tag is + // replaced by the file letter of the involved rook, as for the Shredder-FEN. while ((fen >> token) && !isspace(token)) - set_castling_rights(token); + { + Square rsq; + Color c = islower(token) ? BLACK : WHITE; + Piece rook = make_piece(c, ROOK); + + token = char(toupper(token)); + + if (token == 'K') + for (rsq = relative_square(c, SQ_H1); piece_on(rsq) != rook; rsq--) {} + + else if (token == 'Q') + for (rsq = relative_square(c, SQ_A1); piece_on(rsq) != rook; rsq++) {} + + else if (token >= 'A' && token <= 'H') + rsq = make_square(File(token - 'A'), relative_rank(c, RANK_1)); + + else + continue; + + set_castle_right(king_square(c), rsq); + } // 4. En passant square. Ignore if no pawn capture is possible if ( ((fen >> col) && (col >= 'a' && col <= 'h')) && ((fen >> row) && (row == '3' || row == '6'))) { st->epSquare = make_square(File(col - 'a'), Rank(row - '1')); - Color them = flip(sideToMove); - if (!(attacks_from(st->epSquare, them) & pieces(PAWN, sideToMove))) + if (!(attackers_to(st->epSquare) & pieces(PAWN, sideToMove))) st->epSquare = SQ_NONE; } @@ -196,25 +219,25 @@ void Position::from_fen(const string& fenStr, bool isChess960) { // handle also common incorrect FEN with fullmove = 0. startPosPly = Max(2 * (startPosPly - 1), 0) + int(sideToMove == BLACK); - // Various initialisations - chess960 = isChess960; - st->checkersBB = attackers_to(king_square(sideToMove)) & pieces(flip(sideToMove)); - st->key = compute_key(); st->pawnKey = compute_pawn_key(); st->materialKey = compute_material_key(); st->value = compute_value(); st->npMaterial[WHITE] = compute_non_pawn_material(WHITE); st->npMaterial[BLACK] = compute_non_pawn_material(BLACK); + st->checkersBB = attackers_to(king_square(sideToMove)) & pieces(flip(sideToMove)); + chess960 = isChess960; assert(pos_is_ok()); } -/// Position::set_castle() is an helper function used to set -/// correct castling related flags. +/// Position::set_castle_right() is an helper function used to set castling +/// rights given the corresponding king and rook starting squares. + +void Position::set_castle_right(Square ksq, Square rsq) { -void Position::set_castle(int f, Square ksq, Square rsq) { + int f = (rsq < ksq ? WHITE_OOO : WHITE_OO) << color_of(piece_on(ksq)); st->castleRights |= f; castleRightsMask[ksq] ^= f; @@ -223,41 +246,6 @@ void Position::set_castle(int f, Square ksq, Square rsq) { } -/// Position::set_castling_rights() sets castling parameters castling avaiability. -/// This function is compatible with 3 standards: Normal FEN standard, Shredder-FEN -/// that uses the letters of the columns on which the rooks began the game instead -/// of KQkq and also X-FEN standard that, in case of Chess960, if an inner Rook is -/// associated with the castling right, the traditional castling tag will be replaced -/// by the file letter of the involved rook as for the Shredder-FEN. - -void Position::set_castling_rights(char token) { - - Color c = islower(token) ? BLACK : WHITE; - - Square sqA = relative_square(c, SQ_A1); - Square sqH = relative_square(c, SQ_H1); - Square rsq, ksq = king_square(c); - - token = char(toupper(token)); - - if (token == 'K') - for (rsq = sqH; piece_on(rsq) != make_piece(c, ROOK); rsq--) {} - - else if (token == 'Q') - for (rsq = sqA; piece_on(rsq) != make_piece(c, ROOK); rsq++) {} - - else if (token >= 'A' && token <= 'H') - rsq = make_square(File(token - 'A'), relative_rank(c, RANK_1)); - - else return; - - if (file_of(rsq) < file_of(ksq)) - set_castle(WHITE_OOO << c, ksq, rsq); - else - set_castle(WHITE_OO << c, ksq, rsq); -} - - /// Position::to_fen() returns a FEN representation of the position. In case /// of Chess960 the Shredder-FEN notation is used. Mainly a debugging function. @@ -776,7 +764,7 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI if (is_castle(m)) { st->key = key; - do_castle_move(m); + do_castle_move(m); return; } @@ -793,11 +781,66 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI assert(color_of(piece_on(from)) == us); assert(color_of(piece_on(to)) == them || square_is_empty(to)); - assert(!(ep || pm) || piece == make_piece(us, PAWN)); - assert(!pm || relative_rank(us, to) == RANK_8); + assert(capture != KING); if (capture) - do_capture_move(key, capture, them, to, ep); + { + Square capsq = to; + + // If the captured piece was a pawn, update pawn hash key, otherwise + // update non-pawn material. + if (capture == PAWN) + { + if (ep) // En passant? + { + capsq += pawn_push(them); + + assert(pt == PAWN); + assert(to == st->epSquare); + assert(relative_rank(us, to) == RANK_6); + assert(piece_on(to) == PIECE_NONE); + assert(piece_on(capsq) == make_piece(them, PAWN)); + + board[capsq] = PIECE_NONE; + } + + st->pawnKey ^= zobrist[them][PAWN][capsq]; + } + else + st->npMaterial[them] -= PieceValueMidgame[capture]; + + // Remove captured piece + clear_bit(&byColorBB[them], capsq); + clear_bit(&byTypeBB[capture], capsq); + clear_bit(&occupied, capsq); + + // Update hash key + key ^= zobrist[them][capture][capsq]; + + // Update incremental scores + st->value -= pst(make_piece(them, capture), capsq); + + // Update piece count + pieceCount[them][capture]--; + + // Update material hash key + st->materialKey ^= zobrist[them][capture][pieceCount[them][capture]]; + + // Update piece list, move the last piece at index[capsq] position + // + // WARNING: This is a not perfectly revresible operation. When we + // will reinsert the captured piece in undo_move() we will put it + // at the end of the list and not in its original place, it means + // index[] and pieceList[] are not guaranteed to be invariant to a + // do_move() + undo_move() sequence. + Square lastPieceSquare = pieceList[them][capture][pieceCount[them][capture]]; + index[lastPieceSquare] = index[capsq]; + pieceList[them][capture][index[lastPieceSquare]] = lastPieceSquare; + pieceList[them][capture][pieceCount[them][capture]] = SQ_NONE; + + // Reset rule 50 counter + st->rule50 = 0; + } // Update hash key key ^= zobrist[us][pt][from] ^ zobrist[us][pt][to]; @@ -825,7 +868,7 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI Bitboard move_bb = make_move_bb(from, to); do_move_bb(&byColorBB[us], move_bb); do_move_bb(&byTypeBB[pt], move_bb); - do_move_bb(&byTypeBB[0], move_bb); // HACK: byTypeBB[0] == occupied squares + do_move_bb(&occupied, move_bb); board[to] = board[from]; board[from] = PIECE_NONE; @@ -942,117 +985,58 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI } -/// Position::do_capture_move() is a private method used to update captured -/// piece info. It is called from the main Position::do_move function. - -void Position::do_capture_move(Key& key, PieceType capture, Color them, Square to, bool ep) { - - assert(capture != KING); - - Square capsq = to; - - // If the captured piece was a pawn, update pawn hash key, - // otherwise update non-pawn material. - if (capture == PAWN) - { - if (ep) // en passant ? - { - capsq = to + pawn_push(them); - - assert(to == st->epSquare); - assert(relative_rank(flip(them), to) == RANK_6); - assert(piece_on(to) == PIECE_NONE); - assert(piece_on(capsq) == make_piece(them, PAWN)); - - board[capsq] = PIECE_NONE; - } - st->pawnKey ^= zobrist[them][PAWN][capsq]; - } - else - st->npMaterial[them] -= PieceValueMidgame[capture]; - - // Remove captured piece - clear_bit(&byColorBB[them], capsq); - clear_bit(&byTypeBB[capture], capsq); - clear_bit(&byTypeBB[0], capsq); - - // Update hash key - key ^= zobrist[them][capture][capsq]; - - // Update incremental scores - st->value -= pst(make_piece(them, capture), capsq); - - // Update piece count - pieceCount[them][capture]--; - - // Update material hash key - st->materialKey ^= zobrist[them][capture][pieceCount[them][capture]]; - - // Update piece list, move the last piece at index[capsq] position - // - // WARNING: This is a not perfectly revresible operation. When we - // will reinsert the captured piece in undo_move() we will put it - // at the end of the list and not in its original place, it means - // index[] and pieceList[] are not guaranteed to be invariant to a - // do_move() + undo_move() sequence. - Square lastPieceSquare = pieceList[them][capture][pieceCount[them][capture]]; - index[lastPieceSquare] = index[capsq]; - pieceList[them][capture][index[lastPieceSquare]] = lastPieceSquare; - pieceList[them][capture][pieceCount[them][capture]] = SQ_NONE; - - // Reset rule 50 counter - st->rule50 = 0; -} - - -/// Position::do_castle_move() is a private method used to make a castling -/// move. It is called from the main Position::do_move function. Note that -/// castling moves are encoded as "king captures friendly rook" moves, for -/// instance white short castling in a non-Chess960 game is encoded as e1h1. - +/// Position::do_castle_move() is a private method used to do/undo a castling +/// move. Note that castling moves are encoded as "king captures friendly rook" +/// moves, for instance white short castling in a non-Chess960 game is encoded +/// as e1h1. +template void Position::do_castle_move(Move m) { assert(is_ok(m)); assert(is_castle(m)); - Color us = side_to_move(); - Color them = flip(us); - - // Find source squares for king and rook - Square kfrom = move_from(m); - Square rfrom = move_to(m); - Square kto, rto; + Square kto, kfrom, rfrom, rto, kAfter, rAfter; - assert(piece_on(kfrom) == make_piece(us, KING)); - assert(piece_on(rfrom) == make_piece(us, ROOK)); + Color us = side_to_move(); + Square kBefore = move_from(m); + Square rBefore = move_to(m); - // Find destination squares for king and rook - if (rfrom > kfrom) // O-O + // Find after-castle squares for king and rook + if (rBefore > kBefore) // O-O { - kto = relative_square(us, SQ_G1); - rto = relative_square(us, SQ_F1); + kAfter = relative_square(us, SQ_G1); + rAfter = relative_square(us, SQ_F1); } else // O-O-O { - kto = relative_square(us, SQ_C1); - rto = relative_square(us, SQ_D1); + kAfter = relative_square(us, SQ_C1); + rAfter = relative_square(us, SQ_D1); } + kfrom = Do ? kBefore : kAfter; + rfrom = Do ? rBefore : rAfter; + + kto = Do ? kAfter : kBefore; + rto = Do ? rAfter : rBefore; + + assert(piece_on(kfrom) == make_piece(us, KING)); + assert(piece_on(rfrom) == make_piece(us, ROOK)); + // Remove pieces from source squares clear_bit(&byColorBB[us], kfrom); clear_bit(&byTypeBB[KING], kfrom); - clear_bit(&byTypeBB[0], kfrom); + clear_bit(&occupied, kfrom); clear_bit(&byColorBB[us], rfrom); clear_bit(&byTypeBB[ROOK], rfrom); - clear_bit(&byTypeBB[0], rfrom); + clear_bit(&occupied, rfrom); // Put pieces on destination squares set_bit(&byColorBB[us], kto); set_bit(&byTypeBB[KING], kto); - set_bit(&byTypeBB[0], kto); + set_bit(&occupied, kto); set_bit(&byColorBB[us], rto); set_bit(&byTypeBB[ROOK], rto); - set_bit(&byTypeBB[0], rto); + set_bit(&occupied, rto); // Update board Piece king = make_piece(us, KING); @@ -1068,38 +1052,44 @@ void Position::do_castle_move(Move m) { index[kto] = index[kfrom]; index[rto] = tmp; - // Reset capture field - st->capturedType = PIECE_TYPE_NONE; + if (Do) + { + // Reset capture field + st->capturedType = PIECE_TYPE_NONE; - // Update incremental scores - st->value += pst_delta(king, kfrom, kto); - st->value += pst_delta(rook, rfrom, rto); + // Update incremental scores + st->value += pst_delta(king, kfrom, kto); + st->value += pst_delta(rook, rfrom, rto); - // Update hash key - st->key ^= zobrist[us][KING][kfrom] ^ zobrist[us][KING][kto]; - st->key ^= zobrist[us][ROOK][rfrom] ^ zobrist[us][ROOK][rto]; + // Update hash key + st->key ^= zobrist[us][KING][kfrom] ^ zobrist[us][KING][kto]; + st->key ^= zobrist[us][ROOK][rfrom] ^ zobrist[us][ROOK][rto]; - // Clear en passant square - if (st->epSquare != SQ_NONE) - { - st->key ^= zobEp[st->epSquare]; - st->epSquare = SQ_NONE; - } + // Clear en passant square + if (st->epSquare != SQ_NONE) + { + st->key ^= zobEp[st->epSquare]; + st->epSquare = SQ_NONE; + } - // Update castling rights - st->key ^= zobCastle[st->castleRights]; - st->castleRights &= castleRightsMask[kfrom]; - st->key ^= zobCastle[st->castleRights]; + // Update castling rights + st->key ^= zobCastle[st->castleRights]; + st->castleRights &= castleRightsMask[kfrom]; + st->key ^= zobCastle[st->castleRights]; - // Reset rule 50 counter - st->rule50 = 0; + // Reset rule 50 counter + st->rule50 = 0; - // Update checkers BB - st->checkersBB = attackers_to(king_square(them)) & pieces(us); + // Update checkers BB + st->checkersBB = attackers_to(king_square(flip(us))) & pieces(us); - // Finish - sideToMove = flip(sideToMove); - st->value += (sideToMove == WHITE ? TempoValue : -TempoValue); + // Finish + sideToMove = flip(sideToMove); + st->value += (sideToMove == WHITE ? TempoValue : -TempoValue); + } + else + // Undo: point our state pointer back to the previous state + st = st->previous; assert(pos_is_ok()); } @@ -1116,7 +1106,7 @@ void Position::undo_move(Move m) { if (is_castle(m)) { - undo_castle_move(m); + do_castle_move(m); return; } @@ -1165,7 +1155,7 @@ void Position::undo_move(Move m) { Bitboard move_bb = make_move_bb(to, from); do_move_bb(&byColorBB[us], move_bb); do_move_bb(&byTypeBB[pt], move_bb); - do_move_bb(&byTypeBB[0], move_bb); // HACK: byTypeBB[0] == occupied squares + do_move_bb(&occupied, move_bb); board[from] = make_piece(us, pt); board[to] = PIECE_NONE; @@ -1187,7 +1177,7 @@ void Position::undo_move(Move m) { // Restore the captured piece set_bit(&byColorBB[them], capsq); set_bit(&byTypeBB[st->capturedType], capsq); - set_bit(&byTypeBB[0], capsq); + set_bit(&occupied, capsq); board[capsq] = make_piece(them, st->capturedType); @@ -1206,134 +1196,49 @@ void Position::undo_move(Move m) { } -/// Position::undo_castle_move() is a private method used to unmake a castling -/// move. It is called from the main Position::undo_move function. Note that -/// castling moves are encoded as "king captures friendly rook" moves, for -/// instance white short castling in a non-Chess960 game is encoded as e1h1. - -void Position::undo_castle_move(Move m) { - - assert(is_ok(m)); - assert(is_castle(m)); - - // When we have arrived here, some work has already been done by - // Position::undo_move. In particular, the side to move has been switched, - // so the code below is correct. - Color us = side_to_move(); - - // Find source squares for king and rook - Square kfrom = move_from(m); - Square rfrom = move_to(m); - Square kto, rto; - - // Find destination squares for king and rook - if (rfrom > kfrom) // O-O - { - kto = relative_square(us, SQ_G1); - rto = relative_square(us, SQ_F1); - } - else // O-O-O - { - kto = relative_square(us, SQ_C1); - rto = relative_square(us, SQ_D1); - } - - assert(piece_on(kto) == make_piece(us, KING)); - assert(piece_on(rto) == make_piece(us, ROOK)); - - // Remove pieces from destination squares - clear_bit(&byColorBB[us], kto); - clear_bit(&byTypeBB[KING], kto); - clear_bit(&byTypeBB[0], kto); - clear_bit(&byColorBB[us], rto); - clear_bit(&byTypeBB[ROOK], rto); - clear_bit(&byTypeBB[0], rto); - - // Put pieces on source squares - set_bit(&byColorBB[us], kfrom); - set_bit(&byTypeBB[KING], kfrom); - set_bit(&byTypeBB[0], kfrom); - set_bit(&byColorBB[us], rfrom); - set_bit(&byTypeBB[ROOK], rfrom); - set_bit(&byTypeBB[0], rfrom); - - // Update board - Piece king = make_piece(us, KING); - Piece rook = make_piece(us, ROOK); - board[kto] = board[rto] = PIECE_NONE; - board[kfrom] = king; - board[rfrom] = rook; - - // Update piece lists - pieceList[us][KING][index[kto]] = kfrom; - pieceList[us][ROOK][index[rto]] = rfrom; - int tmp = index[rto]; // In Chess960 could be rto == kfrom - index[kfrom] = index[kto]; - index[rfrom] = tmp; - - // Finally point our state pointer back to the previous state - st = st->previous; - - assert(pos_is_ok()); -} - - -/// Position::do_null_move makes() a "null move": It switches the side to move -/// and updates the hash key without executing any move on the board. - +/// Position::do_null_move() is used to do/undo a "null move": It flips the side +/// to move and updates the hash key without executing any move on the board. +template void Position::do_null_move(StateInfo& backupSt) { assert(!in_check()); // Back up the information necessary to undo the null move to the supplied - // StateInfo object. - // Note that differently from normal case here backupSt is actually used as - // a backup storage not as a new state to be used. - backupSt.key = st->key; - backupSt.epSquare = st->epSquare; - backupSt.value = st->value; - backupSt.previous = st->previous; - backupSt.pliesFromNull = st->pliesFromNull; - st->previous = &backupSt; - - // Update the necessary information - if (st->epSquare != SQ_NONE) - st->key ^= zobEp[st->epSquare]; - - st->key ^= zobSideToMove; - prefetch((char*)TT.first_entry(st->key)); + // StateInfo object. Note that differently from normal case here backupSt + // is actually used as a backup storage not as the new state. This reduces + // the number of fields to be copied. + StateInfo* src = Do ? st : &backupSt; + StateInfo* dst = Do ? &backupSt : st; + + dst->key = src->key; + dst->epSquare = src->epSquare; + dst->value = src->value; + dst->rule50 = src->rule50; + dst->pliesFromNull = src->pliesFromNull; sideToMove = flip(sideToMove); - st->epSquare = SQ_NONE; - st->rule50++; - st->pliesFromNull = 0; - st->value += (sideToMove == WHITE) ? TempoValue : -TempoValue; - - assert(pos_is_ok()); -} - - -/// Position::undo_null_move() unmakes a "null move". - -void Position::undo_null_move() { - assert(!in_check()); + if (Do) + { + if (st->epSquare != SQ_NONE) + st->key ^= zobEp[st->epSquare]; - // Restore information from the our backup StateInfo object - StateInfo* backupSt = st->previous; - st->key = backupSt->key; - st->epSquare = backupSt->epSquare; - st->value = backupSt->value; - st->previous = backupSt->previous; - st->pliesFromNull = backupSt->pliesFromNull; + st->key ^= zobSideToMove; + prefetch((char*)TT.first_entry(st->key)); - // Update the necessary information - sideToMove = flip(sideToMove); - st->rule50--; + st->epSquare = SQ_NONE; + st->rule50++; + st->pliesFromNull = 0; + st->value += (sideToMove == WHITE) ? TempoValue : -TempoValue; + } assert(pos_is_ok()); } +// Explicit template instantiations +template void Position::do_null_move(StateInfo& backupSt); +template void Position::do_null_move(StateInfo& backupSt); + /// Position::see() is a static exchange evaluator: It tries to estimate the /// material gain or loss resulting from a move. There are three versions of @@ -1351,7 +1256,7 @@ int Position::see_sign(Move m) const { // Early return if SEE cannot be negative because captured piece value // is not less then capturing one. Note that king moves always return // here because king midgame value is set to 0. - if (piece_value_midgame(piece_on(to)) >= piece_value_midgame(piece_on(from))) + if (PieceValueMidgame[piece_on(to)] >= PieceValueMidgame[piece_on(from)]) return 1; return see(m); @@ -1360,7 +1265,7 @@ int Position::see_sign(Move m) const { int Position::see(Move m) const { Square from, to; - Bitboard occupied, attackers, stmAttackers, b; + Bitboard occ, attackers, stmAttackers, b; int swapList[32], slIndex = 1; PieceType capturedType, pt; Color stm; @@ -1376,7 +1281,7 @@ int Position::see(Move m) const { from = move_from(m); to = move_to(m); capturedType = type_of(piece_on(to)); - occupied = occupied_squares(); + occ = occupied_squares(); // Handle en passant moves if (st->epSquare == to && type_of(piece_on(from)) == PAWN) @@ -1387,14 +1292,14 @@ int Position::see(Move m) const { assert(type_of(piece_on(capQq)) == PAWN); // Remove the captured pawn - clear_bit(&occupied, capQq); + clear_bit(&occ, capQq); capturedType = PAWN; } // Find all attackers to the destination square, with the moving piece // removed, but possibly an X-ray attacker added behind it. - clear_bit(&occupied, from); - attackers = attackers_to(to, occupied); + clear_bit(&occ, from); + attackers = attackers_to(to, occ); // If the opponent has no attackers we are finished stm = flip(color_of(piece_on(from))); @@ -1421,11 +1326,11 @@ int Position::see(Move m) const { // Remove the attacker we just found from the 'occupied' bitboard, // and scan for new X-ray attacks behind the attacker. b = stmAttackers & pieces(pt); - occupied ^= (b & (~b + 1)); - attackers |= (rook_attacks_bb(to, occupied) & pieces(ROOK, QUEEN)) - | (bishop_attacks_bb(to, occupied) & pieces(BISHOP, QUEEN)); + occ ^= (b & (~b + 1)); + attackers |= (rook_attacks_bb(to, occ) & pieces(ROOK, QUEEN)) + | (bishop_attacks_bb(to, occ) & pieces(BISHOP, QUEEN)); - attackers &= occupied; // Cut out pieces we've already done + attackers &= occ; // Cut out pieces we've already done // Add the new entry to the swap list assert(slIndex < 32); @@ -1481,6 +1386,7 @@ void Position::clear() { } sideToMove = WHITE; nodes = 0; + occupied = 0; } @@ -1498,7 +1404,7 @@ void Position::put_piece(Piece p, Square s) { set_bit(&byTypeBB[pt], s); set_bit(&byColorBB[c], s); - set_bit(&byTypeBB[0], s); // HACK: byTypeBB[0] contains all occupied squares. + set_bit(&occupied, s); } @@ -1558,7 +1464,7 @@ Key Position::compute_material_key() const { for (Color c = WHITE; c <= BLACK; c++) for (PieceType pt = PAWN; pt <= QUEEN; pt++) - for (int i = 0, cnt = piece_count(c, pt); i < cnt; i++) + for (int i = 0; i < piece_count(c, pt); i++) result ^= zobrist[c][pt][i]; return result; @@ -1682,7 +1588,7 @@ void Position::init() { for (Piece p = WP; p <= WK; p++) { - Score ps = make_score(piece_value_midgame(p), piece_value_endgame(p)); + Score ps = make_score(PieceValueMidgame[p], PieceValueEndgame[p]); for (Square s = SQ_A1; s <= SQ_H8; s++) { @@ -1714,13 +1620,13 @@ void Position::flip_me() { // Castling rights if (pos.can_castle(WHITE_OO)) - set_castle(BLACK_OO, king_square(BLACK), flip(pos.castle_rook_square(WHITE_OO))); + set_castle_right(king_square(BLACK), flip(pos.castle_rook_square(WHITE_OO))); if (pos.can_castle(WHITE_OOO)) - set_castle(BLACK_OOO, king_square(BLACK), flip(pos.castle_rook_square(WHITE_OOO))); + set_castle_right(king_square(BLACK), flip(pos.castle_rook_square(WHITE_OOO))); if (pos.can_castle(BLACK_OO)) - set_castle(WHITE_OO, king_square(WHITE), flip(pos.castle_rook_square(BLACK_OO))); + set_castle_right(king_square(WHITE), flip(pos.castle_rook_square(BLACK_OO))); if (pos.can_castle(BLACK_OOO)) - set_castle(WHITE_OOO, king_square(WHITE), flip(pos.castle_rook_square(BLACK_OOO))); + set_castle_right(king_square(WHITE), flip(pos.castle_rook_square(BLACK_OOO))); // En passant square if (pos.st->epSquare != SQ_NONE)