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;
}
{
m = it->move;
it->value = PieceValue[MG][pos.piece_on(to_sq(m))]
- - type_of(pos.moved_piece(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 (pos.capture(m))
it->value = PieceValue[MG][pos.piece_on(to_sq(m))]
- - type_of(pos.moved_piece(m)) + HistoryStats::Max;
+ - Value(type_of(pos.moved_piece(m))) + HistoryStats::Max;
else
it->value = history[pos.moved_piece(m)][to_sq(m)];
}