Retire move.h

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index fdbd834e43742e63edea39f16cd0bc77a793657f..34329582d18854ed989a87f8119a824baec0db85 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -21,7 +21,6 @@
 #define MOVEPICK_H_INCLUDED
 
 #include "history.h"
-#include "move.h"
 #include "position.h"
 #include "types.h"
 
@@ -41,9 +40,9 @@ class MovePicker {
 
 public:
   MovePicker(const Position&, Move, Depth, const History&, SearchStack*, Value);
-  MovePicker(const Position&, Move, Depth, const History&);
+  MovePicker(const Position&, Move, Depth, const History&, Square recaptureSq);
+  MovePicker(const Position&, Move, const History&, PieceType parentCapture);
   Move get_next_move();
-  bool isBadCapture() const;
 
 private:
   void score_captures();
@@ -53,10 +52,13 @@ private:
 
   const Position& pos;
   const History& H;
-  MoveStack ttMoves[2], killers[2];
-  int badCaptureThreshold, phase;
+  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];
 };