Revert "null move reorder" series

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index a5ecb0662015edf7cb01d98dd506327e2031405b..147d5d0b0a666915031f687a82e0d858f7aad5ce 100644 (file)
--- 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 numOfBadCaptures, phase;
+  const MovegenPhaseT* phasePtr;
+  MoveStack *curMove, *lastMove;
   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