X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.cpp;h=1099c5a48a67a9e5f15f1526ce720c299800c06a;hp=2fc8e73666fb78e94d46b75f0dca635f80e6b280;hb=6fb0a1bc4050dd9b15e9c163c46c60f25c48137d;hpb=480682b67097160bfc25e52ab02facffeec104f0

diff --git a/src/pawns.cpp b/src/pawns.cpp
index 2fc8e736..1099c5a4 100644
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -57,9 +57,6 @@ namespace {
     S( 0, 0), S( 0, 0), S(0, 0), S(0, 0),
     S(20,20), S(40,40), S(0, 0), S(0, 0) };
 
-  // Bonus for file distance of the two outermost pawns
-  const Score PawnsFileSpan = S(0, 15);
-
   // Unsupported pawn penalty
   const Score UnsupportedPawnPenalty = S(20, 10);
 
@@ -168,7 +165,7 @@ namespace {
             value -= UnsupportedPawnPenalty;
 
         if (doubled)
-            value -= Doubled[f] / rank_distance(s, lsb(doubled));
+            value -= Doubled[f] / distance<Rank>(s, Square(lsb(doubled)));
 
         if (backward)
             value -= Backward[opposed][f];
@@ -183,10 +180,6 @@ namespace {
     b = e->semiopenFiles[Us] ^ 0xFF;
     e->pawnSpan[Us] = b ? int(msb(b) - lsb(b)) : 0;
 
-    // In endgame it's better to have pawns on both wings. So give a bonus according
-    // to file distance between left and right outermost pawns.
-    value += PawnsFileSpan * e->pawnSpan[Us];
-
     return value;
   }