Revert "null move reorder" series

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index ced0a051654685cbe48fb2c99662d7604de4d38f..147d5d0b0a666915031f687a82e0d858f7aad5ce 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -38,7 +38,6 @@
 struct SearchStack;
 
 enum MovegenPhase {
-  PH_NULL_MOVE,      // Null move
   PH_TT_MOVES,       // Transposition table move and mate killer
   PH_GOOD_CAPTURES,  // Queen promotions and captures with SEE values >= 0
   PH_KILLERS,        // Killer moves from the current ply
@@ -65,7 +64,7 @@ class MovePicker {
   MovePicker& operator=(const MovePicker&); // silence a warning under MSVC
 
 public:
-  MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL, bool useNullMove = false);
+  MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL);
   Move get_next_move();
   Move get_next_move(Lock& lock);
   int number_of_moves() const;
@@ -79,12 +78,12 @@ private:
 
   const Position& pos;
   const History& H;
-  Move ttMoves[2], killers[2];
-  const MovegenPhaseT* phasePtr;
-  int phase, movesPicked, numOfBadCaptures;
+  MoveStack ttMoves[2], killers[2];
   bool finished;
-  Bitboard dc, pinned;
+  int numOfBadCaptures, phase;
+  const MovegenPhaseT* phasePtr;
   MoveStack *curMove, *lastMove;
+  Bitboard dc, pinned;
   MoveStack moves[256], badCaptures[64];
 };