X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.cpp;h=995a5b541e185e6a0e772e02fb879ba6c832e09a;hp=22953cff6d8d4328706cb1ffe4299d46214d2c05;hb=49e110c52b19f5c99954d4797b8e991b0b60007c;hpb=4ede49cd850392f28bc9da9537c111d2c3f0b297

diff --git a/src/material.cpp b/src/material.cpp
index 22953cff..995a5b54 100644
--- a/src/material.cpp
+++ b/src/material.cpp
@@ -173,10 +173,18 @@ Entry* probe(const Position& pos, Table& entries, Endgames& endgames) {
       return e;
   }
 
+  // Draw by insufficient material (trivial draws like KK, KBK and KNK)
+  if (   !pos.pieces(PAWN)
+      &&  pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) <= BishopValueMg)
+  {
+      e->evaluationFunction = &EvaluateKmmKm[pos.side_to_move()];
+      return e;
+  }
+
+  // Minor piece endgame with at least one minor piece per side and
+  // no pawns. Note that the case KmmK is already handled by KXK.
   if (!pos.pieces(PAWN) && !pos.pieces(ROOK) && !pos.pieces(QUEEN))
   {
-      // 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.pieces(WHITE, KNIGHT) | pos.pieces(WHITE, BISHOP)));
       assert((pos.pieces(BLACK, KNIGHT) | pos.pieces(BLACK, BISHOP)));
 
@@ -259,7 +267,7 @@ Entry* probe(const Position& pos, Table& entries, Endgames& endgames) {
       int minorPieceCount =  pos.count<KNIGHT>(WHITE) + pos.count<BISHOP>(WHITE)
                            + pos.count<KNIGHT>(BLACK) + pos.count<BISHOP>(BLACK);
 
-      e->spaceWeight = minorPieceCount * minorPieceCount;
+      e->spaceWeight = make_score(minorPieceCount * minorPieceCount, 0);
   }
 
   // Evaluate the material imbalance. We use PIECE_TYPE_NONE as a place holder