X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=2ea859a26fcf2b9ef4dadfe42d03c0806d082679;hp=a3143598171d666668b03d5989d5df4693fdb87a;hb=ebe021f6a5da63cf0e31da89d4c21e9b5f673fcd;hpb=d490bb99734bd6e2f8a0a352d2f3f1ba264ece66

diff --git a/src/movepick.cpp b/src/movepick.cpp
index a3143598..2ea859a2 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -142,16 +142,16 @@ void MovePicker::score<QUIETS>() {
 
   const HistoryStats& history = pos.this_thread()->history;
 
-  const CounterMoveStats* cmh = (ss-1)->counterMoves;
-  const CounterMoveStats* fmh = (ss-2)->counterMoves;
-  const CounterMoveStats* fmh2 = (ss-4)->counterMoves;
+  const CounterMoveStats& cmh = *(ss-1)->counterMoves;
+  const CounterMoveStats& fmh = *(ss-2)->counterMoves;
+  const CounterMoveStats& fm2 = *(ss-4)->counterMoves;
 
   Color c = pos.side_to_move();
 
   for (auto& m : *this)
-      m.value =   (*cmh)[pos.moved_piece(m)][to_sq(m)]
-               +  (*fmh)[pos.moved_piece(m)][to_sq(m)]
-               + (*fmh2)[pos.moved_piece(m)][to_sq(m)]
+      m.value =  cmh[pos.moved_piece(m)][to_sq(m)]
+               + fmh[pos.moved_piece(m)][to_sq(m)]
+               + fm2[pos.moved_piece(m)][to_sq(m)]
                + history.get(c, m);
 }
 
@@ -175,7 +175,7 @@ void MovePicker::score<EVASIONS>() {
 /// left. It picks the move with the biggest value from a list of generated moves
 /// taking care not to return the ttMove if it has already been searched.
 
-Move MovePicker::next_move() {
+Move MovePicker::next_move(bool skipQuiets) {
 
   Move move;
 
@@ -248,9 +248,11 @@ Move MovePicker::next_move() {
       ++stage;
 
   case QUIET:
-      while (cur < endMoves)
+      while (    cur < endMoves
+             && (!skipQuiets || cur->value >= VALUE_ZERO))
       {
           move = *cur++;
+
           if (   move != ttMove
               && move != ss->killers[0]
               && move != ss->killers[1]