X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fendgame.cpp;h=cc98de90d4f40f71f900c04c1bbc71bd2322ec11;hp=e896e778e96aa8347b3f00405c26eddf580f97f5;hb=8c2fd2170a0d6dececbe87b0c0353ce718dcd9fd;hpb=91c2c44fb1987e3587a9b1037ce6a34369995ba2 diff --git a/src/endgame.cpp b/src/endgame.cpp index e896e778..cc98de90 100644 --- a/src/endgame.cpp +++ b/src/endgame.cpp @@ -134,13 +134,11 @@ Value Endgame::operator()(const Position& pos) const { assert(pos.non_pawn_material(weakerSide) == VALUE_ZERO); assert(!pos.count(weakerSide)); + assert(!pos.checkers()); // Eval is never called when in check // Stalemate detection with lone king - if ( pos.side_to_move() == weakerSide - && !pos.checkers() - && !MoveList(pos).size()) { - return VALUE_DRAW; - } + if (pos.side_to_move() == weakerSide && !MoveList(pos).size()) + return VALUE_DRAW; Square winnerKSq = pos.king_square(strongerSide); Square loserKSq = pos.king_square(weakerSide); @@ -152,9 +150,8 @@ Value Endgame::operator()(const Position& pos) const { if ( pos.count(strongerSide) || pos.count(strongerSide) - || pos.bishop_pair(strongerSide)) { - result += VALUE_KNOWN_WIN; - } + || pos.bishop_pair(strongerSide)) + result += VALUE_KNOWN_WIN; return strongerSide == pos.side_to_move() ? result : -result; }