X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftt.h;h=48c5638a7d971d1ed3c581a37b7a87529948d462;hb=eaeb63f1d03aa71edf719605a31d121bf086a03d;hp=32b4036e39dea085974410867b7212facfc6c625;hpb=92dbee7875254eb54347edd00fae48467b1b0fd2;p=stockfish

diff --git a/src/tt.h b/src/tt.h
index 32b4036e..48c5638a 100644
--- a/src/tt.h
+++ b/src/tt.h
@@ -43,14 +43,34 @@ struct TTEntry {
 
   void save(Key k, Value v, Bound b, Depth d, Move m, Value ev, uint8_t g) {
 
-    if (m || (k >> 48) != key16) // Preserve any existing move for the same position
-        move16 = (uint16_t)m;
-
-    key16     = (uint16_t)(k >> 48);
-    value16   = (int16_t)v;
-    eval16    = (int16_t)ev;
-    genBound8 = (uint8_t)(g | b);
-    depth8    = (int8_t)d;
+      if (key16 != (k >> 48))
+      {
+          key16     = (uint16_t)(k >> 48);
+          move16    = (uint16_t)m;
+          value16   = (int16_t)v;
+          eval16    = (int16_t)ev;
+          genBound8 = (uint8_t)(g | b);
+          depth8    = (int8_t)d;
+      }
+      else
+      {
+          // Preserve any existing move for the same position
+          if (m)
+              move16 = (uint16_t)m;
+
+          // Don't overwrite more valuable values
+          if (   d + 2 > depth8 
+              || g != (genBound8 & 0xFC) 
+              || b == BOUND_EXACT)
+          {
+              value16   = (int16_t)v;
+              genBound8 = (uint8_t)(g | b);
+              depth8    = (int8_t)d;
+          }
+
+          if (ev != VALUE_NONE)
+              eval16 = (int16_t)ev;
+      }
   }
 
 private: