X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fevaluate.cpp;h=3c0be19d2aa0c75d9974b6a86dfe61491d94c0df;hb=95212222c7444538b84326208e433ac12f15e9fb;hp=680b8e0fb58d163598b45a184eb3814f9edc4d0a;hpb=45acec1865f19297d91c6aff0ba64b990ad7d242;p=stockfish

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 680b8e0f..3c0be19d 100644
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -569,13 +569,12 @@ namespace {
             // problem, especially when that pawn is also blocked.
             if (s == relative_square(Us, SQ_A1) || s == relative_square(Us, SQ_H1))
             {
-                SquareDelta d = pawn_push(Us)
-                   + (square_file(s) == FILE_A ? DELTA_E : DELTA_W);
-                if (pos.piece_on(s + d) == piece_of_color_and_type(Us, PAWN))
+                Square d = pawn_push(Us) + (square_file(s) == FILE_A ? DELTA_E : DELTA_W);
+                if (pos.piece_on(s + d) == make_piece(Us, PAWN))
                 {
                     if (!pos.square_is_empty(s + d + pawn_push(Us)))
                         bonus -= 2*TrappedBishopA1H1Penalty;
-                    else if (pos.piece_on(s + 2*d) == piece_of_color_and_type(Us, PAWN))
+                    else if (pos.piece_on(s + 2*d) == make_piece(Us, PAWN))
                         bonus -= TrappedBishopA1H1Penalty;
                     else
                         bonus -= TrappedBishopA1H1Penalty / 2;