X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=dcfb7d46aff3177d95fba2c1cfdc7e13f6ea922e;hp=0fbdab56722b41c8368ad0123dbe3b25c525d764;hb=a2e924039bb96c0b923512dbb6903de9bb6bbd21;hpb=85d1f9c5ecb1efab22cea3db8c14fbb2130323e8 diff --git a/src/search.cpp b/src/search.cpp index 0fbdab56..dcfb7d46 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -937,7 +937,7 @@ split_point_start: // At split points actual search starts from here // At Root and at first iteration do a PV search on all the moves to score root moves isPvMove = (PvNode && moveCount <= (Root ? depth <= ONE_PLY ? 1000 : MultiPV : 1)); givesCheck = pos.move_gives_check(move, ci); - captureOrPromotion = pos.move_is_capture_or_promotion(move); + captureOrPromotion = pos.move_is_capture(move) || move_is_promotion(move); // Step 11. Decide the new search depth ext = extension(pos, move, captureOrPromotion, givesCheck, &dangerous); @@ -1215,7 +1215,8 @@ split_point_start: // At split points actual search starts from here // Update killers and history only for non capture moves that fails high if ( bestValue >= beta - && !pos.move_is_capture_or_promotion(move)) + && !pos.move_is_capture(move) + && !move_is_promotion(move)) { if (move != ss->killers[0]) { @@ -1383,7 +1384,8 @@ split_point_start: // At split points actual search starts from here && !inCheck && givesCheck && move != ttMove - && !pos.move_is_capture_or_promotion(move) + && !pos.move_is_capture(move) + && !move_is_promotion(move) && ss->eval + PawnValueMidgame / 4 < beta && !check_is_dangerous(pos, move, futilityBase, beta, &bestValue)) { @@ -1626,7 +1628,7 @@ split_point_start: // At split points actual search starts from here assert(move_is_ok(m)); assert(threat && move_is_ok(threat)); assert(!pos.move_gives_check(m)); - assert(!pos.move_is_capture_or_promotion(m)); + assert(!pos.move_is_capture(m) && !move_is_promotion(m)); assert(!pos.move_is_passed_pawn_push(m)); Square mfrom, mto, tfrom, tto;