Revert hidden checkers rework

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index e8a32c9316cd3e836e6777f4588cf1e65f185ac7..2c861c71db873377800dca30e2e3d82096739dd2 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -35,6 +35,7 @@
 ////
 
 struct EvalInfo;
+struct SearchStack;
 
 /// MovePicker is a class which is used to pick one legal move at a time from
 /// the current position.  It is initialized with a Position object and a few
@@ -62,7 +63,7 @@ public:
     PH_STOP
   };
 
-  MovePicker(const Position& p, bool pvnode, Move ttm, Move mk, Move k1, Move k2, Depth d, EvalInfo* ei = NULL);
+  MovePicker(const Position& p, bool pvnode, Move ttm, const SearchStack& ss, Depth d, EvalInfo* ei = NULL);
   Move get_next_move();
   Move get_next_move(Lock &lock);
   int number_of_moves() const;
@@ -79,19 +80,17 @@ private:
   void score_qcaptures();
   Move pick_move_from_list();
   int find_best_index();
-  int MovePicker::find_best_index(Bitboard* squares, int values[]);
+  int find_best_index(Bitboard* squares, int values[]);
 
   const Position& pos;
   Move ttMove, mateKiller, killer1, killer2;
   Bitboard pinned, dc;
   MoveStack moves[256], badCaptures[64];
-  Bitboard capSquares;\r
-  int capSqValues[64];
   bool pvNode;
   Depth depth;
   int phaseIndex;
   int numOfMoves, numOfBadCaptures;
-  int movesPicked, badCapturesPicked;
+  int movesPicked;
   bool finished;
 };