X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=db94ed5dc7b9a0efaad54d83d8f17efe6f87202b;hp=5dff67f2a86f0c0f6d4b2d3375af5676a7507f47;hb=0d33466bcd84d9d58ea7049b224f375ba6a51221;hpb=cddc8d4546ab0d7b63081cb75cbca66b9c68628b

diff --git a/src/search.cpp b/src/search.cpp
index 5dff67f2..db94ed5d 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -575,7 +575,7 @@ namespace {
         thisThread->resetCalls = false;
         // At low node count increase the checking rate to about 0.1% of nodes
         // otherwise use a default value.
-        thisThread->callsCnt = Limits.nodes ? std::min(4096LL, Limits.nodes / 1024)
+        thisThread->callsCnt = Limits.nodes ? std::min((int64_t)4096, Limits.nodes / 1024)
                                             : 4096;
     }
 
@@ -950,9 +950,10 @@ moves_loop: // When in check search starts from here
           }
           else if (depth < 7 * ONE_PLY && !extension)
           {
-              Value v = Value(-35 * depth / ONE_PLY * depth / ONE_PLY);
-              if (ss->staticEval != VALUE_NONE)
-                  v += ss->staticEval - alpha - 200;
+              Value v = -Value(399 + 35 * depth / ONE_PLY * depth / ONE_PLY);
+
+              if (PvNode)
+                  v += beta - alpha - 1;
 
               if (!pos.see_ge(move, v))
                   continue;
@@ -995,7 +996,6 @@ moves_loop: // When in check search starts from here
               // castling moves, because they are coded as "king captures rook" and
               // hence break make_move().
               else if (   type_of(move) == NORMAL
-                       && type_of(pos.piece_on(to_sq(move))) != PAWN
                        && !pos.see_ge(make_move(to_sq(move), from_sq(move)),  VALUE_ZERO))
                   r -= 2 * ONE_PLY;