Add and use update_killers()

[stockfish] / src / movepick.cpp

diff --git a/src/movepick.cpp b/src/movepick.cpp
index dc295e17904b8a0af822b05c507f0eac6e747464..b1dcea0111b8c0156883029dacc5e5be02ecaafc 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -66,12 +66,12 @@ namespace {
 /// move ordering is at the current node.
 
 MovePicker::MovePicker(const Position& p, bool pv, Move ttm,
-                       Move mk, Move k1, Move k2, Depth d, EvalInfo* ei) : pos(p) {
+                       const SearchStack& ss, Depth d, EvalInfo* ei) : pos(p) {
   pvNode = pv;
   ttMove = ttm;
-  mateKiller = (mk == ttm)? MOVE_NONE : mk;
-  killer1 = k1;
-  killer2 = k2;
+  mateKiller = (ss.mateKiller == ttm)? MOVE_NONE : ss.mateKiller;
+  killer1 = ss.killers[0];
+  killer2 = ss.killers[0];
   depth = d;
   movesPicked = 0;
   numOfMoves = 0;
@@ -145,7 +145,6 @@ Move MovePicker::get_next_move() {
     case PH_GOOD_CAPTURES:
         numOfMoves = generate_captures(pos, moves);
         score_captures();
-        capSquares = EmptyBoardBB;
         movesPicked = 0;
         break;
 
@@ -383,7 +382,7 @@ Move MovePicker::pick_move_from_list() {
 
       while (movesPicked < numOfMoves)
       {
-          bestIndex = find_best_index(&capSquares, capSqValues);
+          bestIndex = find_best_index();
 
           if (bestIndex != -1) // Found a good capture
           {