X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovepick.h;h=34329582d18854ed989a87f8119a824baec0db85;hb=81cd417b4584b0e3830940c5cb122c898afde08a;hp=fdbd834e43742e63edea39f16cd0bc77a793657f;hpb=4c3a000211bea046dd9506bae748576ecf6368fa;p=stockfish diff --git a/src/movepick.h b/src/movepick.h index fdbd834e..34329582 100644 --- 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]; };