Extend castling independently of singular extension

[stockfish] / src / pawns.cpp

diff --git a/src/pawns.cpp b/src/pawns.cpp
index 1ae65bf181bcb74dac8755704776bf95a31a3a4c..50eb3aa32c3871649cf242833b657ceec73ee497 100644 (file)
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -130,8 +130,8 @@ namespace {
         // Score this pawn
         if (support | phalanx)
         {
-            int v =  Connected[r] * (phalanx ? 3 : 2) / (opposed ? 2 : 1)
-                   + 17 * popcount(support);
+            int v =  Connected[r] * (2 + bool(phalanx) - opposed)
+                   + 21 * 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);
+      File d = map_to_queenside(f);
       bonus += make_score(ShelterStrength[d][ourRank], 0);
 
       if (ourRank && (ourRank == theirRank - 1))