Integrate next_stage() logic into next_move()

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index e69255e604b117f38e1900b397fff43ec159e398..1e1b8e6d1f721a3f5701d4e6e0301cf43b692bc8 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -108,8 +108,7 @@ public:
 
 private:
   template<GenType> void score();
-  void generate_next_stage();
-  ExtMove* begin() { return moves; }
+  ExtMove* begin() { return cur; }
   ExtMove* end() { return endMoves; }
 
   const Position& pos;
@@ -117,12 +116,11 @@ private:
   Move countermove;
   Depth depth;
   Move ttMove;
-  ExtMove killers[3];
   Square recaptureSquare;
   Value threshold;
   int stage;
-  ExtMove* endBadCaptures = moves + MAX_MOVES - 1;
-  ExtMove moves[MAX_MOVES], *cur = moves, *endMoves = moves;
+  ExtMove* cur, *endMoves, *endBadCaptures;
+  ExtMove moves[MAX_MOVES];
 };
 
 #endif // #ifndef MOVEPICK_H_INCLUDED