Sync with master

[stockfish] / src / pawns.cpp

diff --git a/src/pawns.cpp b/src/pawns.cpp
index 0b5c59d3fae0df6048f7852f872557af5274f16b..1408687348fa8f485a14406cc52f22e793517ca8 100644 (file)
--- 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);
 
   kingSquares[Us] = ksq;
   castlingRights[Us] = pos.can_castle(Us);

-  minKingPawnDistance[Us] = 0;
+  int minKingPawnDistance = 0;

 
   Bitboard pawns = pos.pieces(Us, PAWN);
   if (pawns)
 
   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)
 
   if (relative_rank(Us, ksq) > RANK_4)

-      return make_score(0, -16 * minKingPawnDistance[Us]);
+      return make_score(0, -16 * minKingPawnDistance);

 
   Value bonus = shelter_storm<Us>(pos, ksq);
 
 
   Value bonus = shelter_storm<Us>(pos, ksq);
 


@@ -312,7 +312,7 @@ Score Entry::do_king_safety(const Position& pos, Square ksq) {
   if (pos.can_castle(MakeCastling<Us, QUEEN_SIDE>::right))
       bonus = std::max(bonus, shelter_storm<Us>(pos, relative_square(Us, SQ_C1)));
 
   if (pos.can_castle(MakeCastling<Us, QUEEN_SIDE>::right))
       bonus = std::max(bonus, shelter_storm<Us>(pos, relative_square(Us, SQ_C1)));
 

-  return make_score(bonus, -16 * minKingPawnDistance[Us]);
+  return make_score(bonus, -16 * minKingPawnDistance);

 }
 
 // Explicit template instantiation
 }
 
 // Explicit template instantiation