X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=d4242a300de7620e5f58665cb20c7e5ff0aa102c;hp=95bbddba670788af7d2b937a72ddb4c28a791a31;hb=db1b0bfa1d8391281e5e0b1f93564a1e52c41ed2;hpb=6f946f823c72bcb4a80de6e50cb5111736ffa885 diff --git a/src/movepick.cpp b/src/movepick.cpp index 95bbddba..d4242a30 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -228,29 +228,18 @@ void MovePicker::score_captures() { // to the badCaptures[] array. Move m; int seeValue; - Square from, to; for (int i = 0; i < numOfMoves; i++) { m = moves[i].move; - from = move_from(m); - to = move_to(m); - - bool hxl = ( int(pos.midgame_value_of_piece_on(from)) - -int(pos.midgame_value_of_piece_on(to)) > 0) - || pos.type_of_piece_on(from) == KING; - - // Avoid calling see() for LxH and equal captures because - // SEE is always >= 0 and we order for MVV/LVA anyway. - seeValue = (hxl ? pos.see(m) : 0); - + seeValue = pos.see(m); if (seeValue >= 0) { if (move_promotion(m)) moves[i].score = QueenValueMidgame; else - moves[i].score = int(pos.midgame_value_of_piece_on(to)) - -int(pos.type_of_piece_on(from)); + moves[i].score = int(pos.midgame_value_of_piece_on(move_to(m))) + -int(pos.type_of_piece_on(move_from(m))); } else {