}
-/// Entry::update_safety() calculates and caches a bonus for king safety. It is
-/// called only when king square changes, about 20% of total king_safety() calls.
+/// Entry::update_safety() calculates and caches a bonus for king safety.
+/// It is called only when king square changes, which is about 20% of total
+/// king_safety() calls.
template<Color Us>
Score Entry::update_safety(const Position& pos, Square ksq) {
kingSquares[Us] = ksq;
- castleRights[Us] = pos.can_castle(Us);
+ castlingFlags[Us] = pos.can_castle(Us);
minKPdistance[Us] = 0;
Bitboard pawns = pos.pieces(Us, PAWN);
Value bonus = shelter_storm<Us>(pos, ksq);
- // If we can castle use the bonus after the castle if it is bigger
- if (pos.can_castle(make_castle_right(Us, KING_SIDE)))
+ // If we can castle use the bonus after the castling if it is bigger
+ if (pos.can_castle(make_castling_flag(Us, KING_SIDE)))
bonus = std::max(bonus, shelter_storm<Us>(pos, relative_square(Us, SQ_G1)));
- if (pos.can_castle(make_castle_right(Us, QUEEN_SIDE)))
+ if (pos.can_castle(make_castling_flag(Us, QUEEN_SIDE)))
bonus = std::max(bonus, shelter_storm<Us>(pos, relative_square(Us, SQ_C1)));
return kingSafety[Us] = make_score(bonus, -16 * minKPdistance[Us]);