const History& h, SearchStack* ss) : pos(p), H(h) {
int searchTT = ttm;
ttMoves[0].move = ttm;
- finished = false;
lastBadCapture = badCaptures;
pinned = p.pinned_pieces(pos.side_to_move());
return;
case PH_STOP:
- lastMove = curMove + 1; // hack to be friendly for get_next_move()
+ lastMove = curMove + 1; // Avoids another go_next_phase() call
return;
default:
hs += 1000;
// pst based scoring
- cur->score = hs + pos.pst_delta(piece, from, to).mg();
+ cur->score = hs + mg_value(pos.pst_delta(piece, from, to));
}
}
Move MovePicker::get_next_move(Lock &lock) {
lock_grab(&lock);
- if (finished)
- {
- lock_release(&lock);
- return MOVE_NONE;
- }
+
+ // Note that it is safe to call many times
+ // get_next_move() when phase == PH_STOP
Move m = get_next_move();
- if (m == MOVE_NONE)
- finished = true;
lock_release(&lock);
return m;