X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=b31d9dd2d48dafbdc3fc1f985e58189f645f5404;hp=46cf69ddce30ec4f51f51b83f92b04d740d0e4e5;hb=9ab84a816539ade23868f0383e39634e6ab88df5;hpb=f6d245291664e1a521b3810051365c48c82bac78

diff --git a/src/movepick.h b/src/movepick.h
index 46cf69dd..b31d9dd2 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -75,14 +75,15 @@ private:
   void score_captures();
   void score_noncaptures();
   void score_evasions();
-  Move pick_move_from_list();
+  void go_next_phase();
 
   const Position& pos;
   const History& H;
-  Move ttMoves[2], killers[2];
-  const MovegenPhaseT* phasePtr;
-  int movesPicked, numOfMoves, numOfBadCaptures;
+  MoveStack ttMoves[2], killers[2];
   bool finished;
+  int numOfBadCaptures, phase;
+  const MovegenPhaseT* phasePtr;
+  MoveStack *curMove, *lastMove;
   Bitboard dc, pinned;
   MoveStack moves[256], badCaptures[64];
 };
@@ -98,7 +99,7 @@ private:
 /// a single reply to check.
 
 inline int MovePicker::number_of_moves() const {
-  return numOfMoves;
+  return int(lastMove - moves);
 }
 
 /// MovePicker::discovered_check_candidates() returns a bitboard containing