X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpawns.h;h=ef4b83f844b60785c3cca123313537f5e176331b;hb=5935daf8a5b6925a6af2084f87e3831b3bb17dac;hp=96ed4149216fc24527e920d86c4e0ed5ab477122;hpb=76777b663a5f5a2dcfaafa19c15d02d11c401bdf;p=stockfish diff --git a/src/pawns.h b/src/pawns.h index 96ed4149..ef4b83f8 100644 --- a/src/pawns.h +++ b/src/pawns.h @@ -37,12 +37,7 @@ struct Entry { Bitboard pawn_attacks(Color c) const { return pawnAttacks[c]; } Bitboard passed_pawns(Color c) const { return passedPawns[c]; } Bitboard pawn_attacks_span(Color c) const { return pawnAttacksSpan[c]; } - int weak_unopposed(Color c) const { return weakUnopposed[c]; } - int passed_count() const { return popcount(passedPawns[WHITE] | passedPawns[BLACK]); }; - - int pawns_on_same_color_squares(Color c, Square s) const { - return pawnsOnSquares[c][bool(DarkSquares & s)]; - } + int passed_count() const { return popcount(passedPawns[WHITE] | passedPawns[BLACK]); } template Score king_safety(const Position& pos) { @@ -54,7 +49,7 @@ struct Entry { Score do_king_safety(const Position& pos); template - Value evaluate_shelter(const Position& pos, Square ksq); + void evaluate_shelter(const Position& pos, Square ksq, Score& shelter); Key key; Score scores[COLOR_NB]; @@ -63,7 +58,6 @@ struct Entry { Bitboard pawnAttacksSpan[COLOR_NB]; Square kingSquares[COLOR_NB]; Score kingSafety[COLOR_NB]; - int weakUnopposed[COLOR_NB]; int castlingRights[COLOR_NB]; int pawnsOnSquares[COLOR_NB][COLOR_NB]; // [color][light/dark squares] };