X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovepick.h;h=27adb101552160c5fe0613a691f8dce665aff43f;hb=c9d364f9caf5bdbd61d1fcbe85142d4ebaafad7c;hp=a5ecb0662015edf7cb01d98dd506327e2031405b;hpb=595a90dfd0cd393a8805f4f51cf5c5d8b264c121;p=stockfish

diff --git a/src/movepick.h b/src/movepick.h
index a5ecb066..27adb101 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -74,14 +74,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 phase;
+  const MovegenPhaseT* phasePtr;
+  MoveStack *curMove, *lastMove, *lastBadCapture;
   Bitboard dc, pinned;
   MoveStack moves[256], badCaptures[64];
 };
@@ -97,7 +98,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