X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.cpp;h=d822ef4ef85e8387d7a206db3f85714646844ee2;hp=1ae65bf181bcb74dac8755704776bf95a31a3a4c;hb=7756344d5d2b93970e7cd423f8cbf6fb1da11b74;hpb=270b241ec12ad3a32634a846b87ec9dc08fa2730

diff --git a/src/pawns.cpp b/src/pawns.cpp
index 1ae65bf1..d822ef4e 100644
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -130,7 +130,7 @@ namespace {
         // Score this pawn
         if (support | phalanx)
         {
-            int v =  Connected[r] * (phalanx ? 3 : 2) / (opposed ? 2 : 1)
+            int v =  Connected[r] * (2 + bool(phalanx) - opposed)
                    + 17 * popcount(support);
 
             score += make_score(v, v * (r - 2) / 4);
@@ -198,7 +198,7 @@ Score Entry::evaluate_shelter(const Position& pos, Square ksq) {
       b = theirPawns & file_bb(f);
       int theirRank = b ? relative_rank(Us, frontmost_sq(Them, b)) : 0;
 
-      int d = std::min(f, ~f);
+      int d = map_to_queenside(f);
       bonus += make_score(ShelterStrength[d][ourRank], 0);
 
       if (ourRank && (ourRank == theirRank - 1))