X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=0082fc09547891205b0269a888c8c0d4a6fdb037;hp=b9f9ff505098acc04f7c221fb46779af34bcd5a1;hb=74db0f0f4068ac9520acb16465e328436127bd4f;hpb=a010d438a2e378a82943835d49a53dfaa15c95d1 diff --git a/src/evaluate.cpp b/src/evaluate.cpp index b9f9ff50..0082fc09 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -900,13 +900,16 @@ namespace { - square_distance(pos.king_square(opposite_color(c)), queeningSquare) + int(c != pos.side_to_move()); - if (d < 0) + // Do we protect the path to queening ? + bool pathDefended = (ei.attacked_by(c) & squares_in_front_of(c, s)) == squares_in_front_of(c, s); + + if (d < 0 || pathDefended) { int mtg = RANK_8 - relative_rank(c, s); int blockerCount = count_1s_max_15(squares_in_front_of(c, s) & pos.occupied_squares()); mtg += blockerCount; d += blockerCount; - if (d < 0 && (!movesToGo[c] || movesToGo[c] > mtg)) + if ((d < 0 || pathDefended) && (!movesToGo[c] || movesToGo[c] > mtg)) { movesToGo[c] = mtg; pawnToGo[c] = s;