X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovepick.cpp;h=4c75b0fe2c00dfb0e464f113e9ad911cb53b57a6;hb=c6630abe0d6f229af7d6ae788643a0e8fa1737f7;hp=20aaabbdde0288a28743ea230706dc2905cc281f;hpb=c6d62b7da5b9bb0e8c987596d1c6a304b337ca32;p=stockfish diff --git a/src/movepick.cpp b/src/movepick.cpp index 20aaabbd..4c75b0fe 100644 --- a/src/movepick.cpp +++ b/src/movepick.cpp @@ -130,7 +130,7 @@ Move MovePicker::get_next_move() { if (ttMove != MOVE_NONE) { assert(move_is_ok(ttMove)); - if (move_is_legal(pos, ttMove, pinned)) + if (move_is_legal(pos, ttMove)) return ttMove; } break; @@ -139,7 +139,7 @@ Move MovePicker::get_next_move() { if (mateKiller != MOVE_NONE) { assert(move_is_ok(mateKiller)); - if (move_is_legal(pos, mateKiller, pinned)) + if (move_is_legal(pos, mateKiller)) return mateKiller; } break; @@ -151,7 +151,7 @@ Move MovePicker::get_next_move() { break; case PH_BAD_CAPTURES: - badCapturesPicked = 0; + movesPicked = 0; break; case PH_NONCAPTURES: @@ -174,7 +174,7 @@ Move MovePicker::get_next_move() { break; case PH_QCHECKS: - numOfMoves = generate_checks(pos, moves, dc); + numOfMoves = generate_checks(pos, moves); movesPicked = 0; break; @@ -394,7 +394,7 @@ Move MovePicker::pick_move_from_list() { moves[bestIndex] = moves[movesPicked++]; if ( move != ttMove && move != mateKiller - && pos.pl_move_is_legal(move, pinned)) + && pos.pl_move_is_legal(move)) return move; } break; @@ -414,7 +414,7 @@ Move MovePicker::pick_move_from_list() { moves[bestIndex] = moves[movesPicked++]; if ( move != ttMove && move != mateKiller - && pos.pl_move_is_legal(move, pinned)) + && pos.pl_move_is_legal(move)) return move; } break; @@ -434,15 +434,15 @@ Move MovePicker::pick_move_from_list() { case PH_BAD_CAPTURES: assert(!pos.is_check()); - assert(badCapturesPicked >= 0); + assert(movesPicked >= 0); // It's probably a good idea to use SEE move ordering here, instead // of just picking the first move. FIXME - while (badCapturesPicked < numOfBadCaptures) + while (movesPicked < numOfBadCaptures) { - move = badCaptures[badCapturesPicked++].move; + move = badCaptures[movesPicked++].move; if ( move != ttMove && move != mateKiller - && pos.pl_move_is_legal(move, pinned)) + && pos.pl_move_is_legal(move)) return move; } break; @@ -457,7 +457,7 @@ Move MovePicker::pick_move_from_list() { moves[bestIndex] = moves[movesPicked++]; // Remember to change the line below if we decide to hash the qsearch! // Maybe also postpone the legality check until after futility pruning? - if (/* move != ttMove && */ pos.pl_move_is_legal(move, pinned)) + if (/* move != ttMove && */ pos.pl_move_is_legal(move)) return move; } break; @@ -471,7 +471,7 @@ Move MovePicker::pick_move_from_list() { { move = moves[movesPicked++].move; // Remember to change the line below if we decide to hash the qsearch! - if (/* move != ttMove && */ pos.pl_move_is_legal(move, pinned)) + if (/* move != ttMove && */ pos.pl_move_is_legal(move)) return move; } break;