X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=1a1334fe1e4e3f8858ba70f245c23a1b875f5851;hp=e861f5f032e95d80f54bb4137447e617686b338b;hb=e00bb13e8540058987ccfb8006f164acfd0acdcf;hpb=06b9140e5ccd9e3579315ea2abb2ba93126c48fa

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index e861f5f0..1a1334fe 100644
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -651,19 +651,19 @@ Value do_evaluate(const Position& pos, Value& margin) {
 
             if (    file_of(ksq) >= FILE_E
                 &&  file_of(s) > file_of(ksq)
-                && (relative_rank(Us, ksq) == RANK_1 || rank_of(ksq) == rank_of(s)))
+                && (relative_rank(Us, ksq) == RANK_1 || rank_of(ksq) == rank_of(s))
+                && !ei.pi->has_open_file_to_right(Us, file_of(ksq)))
             {
                 // Is there a half-open file between the king and the edge of the board?
-                if (!ei.pi->has_open_file_to_right(Us, file_of(ksq)))
                     score -= make_score(pos.can_castle(Us) ? (TrappedRookPenalty - mob * 16) / 2
                                                            : (TrappedRookPenalty - mob * 16), 0);
             }
             else if (    file_of(ksq) <= FILE_D
                      &&  file_of(s) < file_of(ksq)
-                     && (relative_rank(Us, ksq) == RANK_1 || rank_of(ksq) == rank_of(s)))
+                     && (relative_rank(Us, ksq) == RANK_1 || rank_of(ksq) == rank_of(s))
+                     && !ei.pi->has_open_file_to_left(Us, file_of(ksq)))
             {
                 // Is there a half-open file between the king and the edge of the board?
-                if (!ei.pi->has_open_file_to_left(Us, file_of(ksq)))
                     score -= make_score(pos.can_castle(Us) ? (TrappedRookPenalty - mob * 16) / 2
                                                            : (TrappedRookPenalty - mob * 16), 0);
             }
@@ -730,7 +730,7 @@ Value do_evaluate(const Position& pos, Value& margin) {
     Score score = mobility = SCORE_ZERO;
 
     // Do not include in mobility squares protected by enemy pawns or occupied by our pieces
-    const Bitboard mobilityArea = ~(ei.attackedBy[Them][PAWN] | pos.pieces(Us));
+    const Bitboard mobilityArea = ~(ei.attackedBy[Them][PAWN] | pos.pieces(Us, PAWN, KING));
 
     score += evaluate_pieces<KNIGHT, Us, Trace>(pos, ei, mobility, mobilityArea);
     score += evaluate_pieces<BISHOP, Us, Trace>(pos, ei, mobility, mobilityArea);