X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmaterial.cpp;h=a3d9f7c8a73958ca7c8235e6f62c81ec85479d58;hb=18cd83a38042a3993678e88bc8163ceb1cbd62b4;hp=b16710588bbed14f4c1a5c7e61cc027b9188cf4c;hpb=46ffea46ea64ff070cff07ce374f3618e9b631c8;p=stockfish diff --git a/src/material.cpp b/src/material.cpp index b1671058..a3d9f7c8 100644 --- a/src/material.cpp +++ b/src/material.cpp @@ -171,14 +171,14 @@ MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) { mi->evaluationFunction = &EvaluateKKX; return mi; } - else if ( pos.pawns() == EmptyBoardBB - && pos.rooks() == EmptyBoardBB - && pos.queens() == EmptyBoardBB) + else if ( pos.pieces(PAWN) == EmptyBoardBB + && pos.pieces(ROOK) == EmptyBoardBB + && pos.pieces(QUEEN) == EmptyBoardBB) { // Minor piece endgame with at least one minor piece per side and // no pawns. Note that the case KmmK is already handled by KXK. - assert(pos.knights(WHITE) | pos.bishops(WHITE)); - assert(pos.knights(BLACK) | pos.bishops(BLACK)); + assert((pos.pieces(KNIGHT, WHITE) | pos.pieces(BISHOP, WHITE))); + assert((pos.pieces(KNIGHT, BLACK) | pos.pieces(BISHOP, BLACK))); if ( pos.piece_count(WHITE, BISHOP) + pos.piece_count(WHITE, KNIGHT) <= 2 && pos.piece_count(BLACK, BISHOP) + pos.piece_count(BLACK, KNIGHT) <= 2)