Retire seeValues[] and move PieceValue[] out of Position

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index 27c33047f7728839fd6c9743126122db7f45c9c3..3ade58edf3f9e7eac3975ded6e9d7157848f0d7e 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -41,8 +41,8 @@ class MovePicker {
 
 public:
   MovePicker(const Position&, Move, Depth, const History&, SearchStack*, Value);
-  MovePicker(const Position&, Move, Depth, const History&);
-  MovePicker(const Position&, Move, const History&, int parentCapture);
+  MovePicker(const Position&, Move, Depth, const History&, Square recaptureSq);
+  MovePicker(const Position&, Move, const History&, PieceType parentCapture);
   Move get_next_move();
 
 private:
@@ -53,11 +53,13 @@ private:
 
   const Position& pos;
   const History& H;
+  Depth depth;
   Move ttMove;
   MoveStack killers[2];
+  Square recaptureSquare;
   int captureThreshold, phase;
   const uint8_t* phasePtr;
-  MoveStack *curMove, *lastMove, *lastGoodNonCapture, *badCaptures;
+  MoveStack *curMove, *lastMove, *lastNonCapture, *badCaptures;
   MoveStack moves[MAX_MOVES];
 };