X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fmovepick.cpp;h=43f30f7709565e22502e6e94438a0aa91ac663d1;hb=75d001adddfaa7a2eb57af99cf6c57a12913d2d1;hp=b1dcea0111b8c0156883029dacc5e5be02ecaafc;hpb=93bc05cf693064b80bf70cb97c6d110ab8f0a015;p=stockfish diff --git a/src/movepick.cpp b/src/movepick.cpp index b1dcea01..43f30f77 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -78,11 +78,14 @@ MovePicker::MovePicker(const Position& p, bool pv, Move ttm, numOfBadCaptures = 0; // With EvalInfo we are able to know how many captures are possible before - // generating them. So avoid generating them in case we know are zero. + // generating them. So avoid generating in case we know are zero. Color us = pos.side_to_move(); Color them = opposite_color(us); - bool noAttacks = ei && (ei->attackedBy[us][0] & pos.pieces_of_color(them)) == 0; - bool noCaptures = noAttacks && (pos.ep_square() == SQ_NONE) && !pos.has_pawn_on_7th(us); + bool noCaptures = ei + && (ei->attackedBy[us][0] & pos.pieces_of_color(them)) == 0 + && !ei->mi->specialized_eval_exists() + && (pos.ep_square() == SQ_NONE) + && !pos.has_pawn_on_7th(us); if (p.is_check()) phaseIndex = EvasionsPhaseIndex; @@ -93,7 +96,6 @@ MovePicker::MovePicker(const Position& p, bool pv, Move ttm, else phaseIndex = (noCaptures ? NoMovesPhaseIndex : QsearchWithoutChecksPhaseIndex); - dc = p.discovered_check_candidates(us); pinned = p.pinned_pieces(p.side_to_move());