X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fendgame.cpp;h=d7cb2b3c8c58541a54d0e662aff2d25110a1e07f;hp=d458cd66d78df9c4a46281a3201d5505a3f92fc8;hb=0347339970b68b998c7202e22c01560850dcd13e;hpb=40e939421f290c0dc3dc055f4d79ab56b54f15d8

diff --git a/src/endgame.cpp b/src/endgame.cpp
index d458cd66..d7cb2b3c 100644
--- a/src/endgame.cpp
+++ b/src/endgame.cpp
@@ -82,6 +82,21 @@ namespace {
   template<typename M>
   void delete_endgame(const typename M::value_type& p) { delete p.second; }
 
+  // Fast stalemate detection with lone king
+  bool is_kxk_stalemate(const Position &pos, const Color c) {
+    if ( pos.side_to_move() == c &&
+        !pos.in_check()) {
+      const Square from = pos.king_square(c);
+      Bitboard b = pos.attacks_from<KING>(from);
+      while (b) {
+        // Assume there are no pinned pieces, as it is a lone king
+        if (pos.pl_move_is_legal(make_move(from, pop_1st_bit(&b)), 0))
+          return false;
+      }
+      return true;
+    }
+    return false;
+  }
 } // namespace
 
 
@@ -132,6 +147,10 @@ Value Endgame<KXK>::operator()(const Position& pos) const {
   assert(pos.non_pawn_material(weakerSide) == VALUE_ZERO);
   assert(pos.piece_count(weakerSide, PAWN) == VALUE_ZERO);
 
+  if (is_kxk_stalemate(pos, weakerSide)) {
+    return VALUE_DRAW;
+  }
+  
   Square winnerKSq = pos.king_square(strongerSide);
   Square loserKSq = pos.king_square(weakerSide);
 
@@ -142,9 +161,9 @@ Value Endgame<KXK>::operator()(const Position& pos) const {
 
   if (   pos.piece_count(strongerSide, QUEEN)
       || pos.piece_count(strongerSide, ROOK)
-      || pos.piece_count(strongerSide, BISHOP) > 1)
-      // TODO: check for two equal-colored bishops!
-      result += VALUE_KNOWN_WIN;
+      || pos.both_color_bishops(strongerSide)) {
+    result += VALUE_KNOWN_WIN;
+  }
 
   return strongerSide == pos.side_to_move() ? result : -result;
 }