X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=69cf6ff67404ea740850aa169e9f8f8dcb90f542;hp=b42f839bc8bc571fcf3dc4a3e544b6dad4400076;hb=2e70a2873f42e327546248172baa77a76ae0b0fc;hpb=c8af7a867e91e833f76b564f6f430c96829760bc diff --git a/src/movepick.h b/src/movepick.h index b42f839b..69cf6ff6 100644 --- a/src/movepick.h +++ b/src/movepick.h @@ -27,7 +27,6 @@ #include "depth.h" #include "history.h" -#include "lock.h" #include "position.h" @@ -52,13 +51,12 @@ class MovePicker { public: MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL); Move get_next_move(); - Move get_next_move(Lock& lock); int number_of_evasions() const; private: void score_captures(); void score_noncaptures(); - void score_evasions(); + void score_evasions_or_checks(); void go_next_phase(); const Position& pos; @@ -66,7 +64,7 @@ private: MoveStack ttMoves[2], killers[2]; int phase; const uint8_t* phasePtr; - MoveStack *curMove, *lastMove, *lastBadCapture; + MoveStack *curMove, *lastMove, *lastGoodNonCapture, *lastBadCapture; Bitboard pinned; MoveStack moves[256], badCaptures[64]; };