followupmoves = fm;
ss = s;
- if (p.checkers())
+ if (pos.checkers())
stage = EVASION;
else
}
MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h,
- Square sq) : pos(p), history(h), cur(moves), end(moves) {
+ Square s) : pos(p), history(h), cur(moves), end(moves) {
assert(d <= DEPTH_ZERO);
- if (p.checkers())
+ if (pos.checkers())
stage = EVASION;
else if (d > DEPTH_QS_NO_CHECKS)
else
{
stage = RECAPTURE;
- recaptureSquare = sq;
+ recaptureSquare = s;
ttm = MOVE_NONE;
}
it->value = PieceValue[MG][pos.piece_on(to_sq(m))]
- Value(type_of(pos.moved_piece(m)));
- if (type_of(m) == PROMOTION)
- it->value += PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN];
-
- else if (type_of(m) == ENPASSANT)
+ if (type_of(m) == ENPASSANT)
it->value += PieceValue[MG][PAWN];
+
+ else if (type_of(m) == PROMOTION)
+ it->value += PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN];
}
}
case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: case RECAPTURE:
stage = STOP;
+ /* Fall through */
+
case STOP:
end = cur + 1; // Avoid another next_phase() call
return;
case KILLERS_S1:
move = (cur++)->move;
if ( move != MOVE_NONE
- && pos.pseudo_legal(move)
&& move != ttMove
+ && pos.pseudo_legal(move)
&& !pos.capture(move))
return move;
break;