X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=b2a8dc98bbe1b38096b27f78a984620bb24a9ebd;hp=fdbd834e43742e63edea39f16cd0bc77a793657f;hb=d543a64cc7fc06daed275b332b10ea06ba738001;hpb=4c3a000211bea046dd9506bae748576ecf6368fa

diff --git a/src/movepick.h b/src/movepick.h
index fdbd834e..b2a8dc98 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -21,12 +21,10 @@
 #define MOVEPICK_H_INCLUDED
 
 #include "history.h"
-#include "move.h"
 #include "position.h"
+#include "search.h"
 #include "types.h"
 
-struct SearchStack;
-
 /// MovePicker is a class which is used to pick one pseudo legal move at a time
 /// from the current position. It is initialized with a Position object and a few
 /// moves we have reason to believe are good. The most important method is
@@ -40,10 +38,10 @@ class MovePicker {
   MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
 
 public:
-  MovePicker(const Position&, Move, Depth, const History&, SearchStack*, Value);
-  MovePicker(const Position&, Move, Depth, const History&);
+  MovePicker(const Position&, Move, Depth, const History&, Search::Stack*, Value);
+  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 +51,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];
 };