From: Marco Costalba Date: Sat, 7 Mar 2015 09:52:55 +0000 (+0100) Subject: Sync with master X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=be509525336b65419e708678abe4e16efb5f6f4d;hp=e53774bc49dd0aaa1c129ee98c09e1a56ef974fb Sync with master bench: 8285241 --- diff --git a/src/pawns.cpp b/src/pawns.cpp index 0b5c59d3..14086873 100644 --- a/src/pawns.cpp +++ b/src/pawns.cpp @@ -294,14 +294,14 @@ Score Entry::do_king_safety(const Position& pos, Square ksq) { kingSquares[Us] = ksq; castlingRights[Us] = pos.can_castle(Us); - minKingPawnDistance[Us] = 0; + int minKingPawnDistance = 0; Bitboard pawns = pos.pieces(Us, PAWN); if (pawns) - while (!(DistanceRingBB[ksq][minKingPawnDistance[Us]++] & pawns)) {} + while (!(DistanceRingBB[ksq][minKingPawnDistance++] & pawns)) {} if (relative_rank(Us, ksq) > RANK_4) - return make_score(0, -16 * minKingPawnDistance[Us]); + return make_score(0, -16 * minKingPawnDistance); Value bonus = shelter_storm(pos, ksq); @@ -312,7 +312,7 @@ Score Entry::do_king_safety(const Position& pos, Square ksq) { if (pos.can_castle(MakeCastling::right)) bonus = std::max(bonus, shelter_storm(pos, relative_square(Us, SQ_C1))); - return make_score(bonus, -16 * minKingPawnDistance[Us]); + return make_score(bonus, -16 * minKingPawnDistance); } // Explicit template instantiation diff --git a/src/pawns.h b/src/pawns.h index df38d55c..aacaf724 100644 --- a/src/pawns.h +++ b/src/pawns.h @@ -67,7 +67,6 @@ struct Entry { Bitboard pawnAttacks[COLOR_NB]; Square kingSquares[COLOR_NB]; Score kingSafety[COLOR_NB]; - int minKingPawnDistance[COLOR_NB]; int castlingRights[COLOR_NB]; int semiopenFiles[COLOR_NB]; int pawnSpan[COLOR_NB];