Convert killers to a vector

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index c7b1ddaf58be40533e6e170b8ca6ef1e047b4801..8f809ca9900312b263906fb4a5cddc75bdcbca4d 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -28,12 +28,15 @@
 #include "depth.h"
 #include "lock.h"
 #include "position.h"
+#include "search.h"
 
 
 ////
 //// Types
 ////
 
+struct EvalInfo;
+
 /// MovePicker is a class which is used to pick one 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
@@ -60,7 +63,7 @@ public:
     PH_STOP
   };
 
-  MovePicker(const Position& p, bool pvnode, Move ttm, Move mk, Move k1, Move k2, Depth d);
+  MovePicker(const Position& p, bool pvnode, Move ttm, const SearchStack& ss, Depth d, EvalInfo* ei = NULL);
   Move get_next_move();
   Move get_next_move(Lock &lock);
   int number_of_moves() const;
@@ -83,8 +86,6 @@ private:
   Move ttMove, mateKiller, killer1, killer2;
   Bitboard pinned, dc;
   MoveStack moves[256], badCaptures[64];
-  Bitboard capSquares;\r
-  int capSqValues[64];
   bool pvNode;
   Depth depth;
   int phaseIndex;