Use pointers instead of array indices in MovePicker

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index c9c37f93c7a7f709cbd1e190234f04dfec52d3d9..ced0a051654685cbe48fb2c99662d7604de4d38f 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -81,9 +81,10 @@ private:
   const History& H;
   Move ttMoves[2], killers[2];
   const MovegenPhaseT* phasePtr;
   const History& H;
   Move ttMoves[2], killers[2];
   const MovegenPhaseT* phasePtr;

-  int phase, movesPicked, numOfMoves, numOfBadCaptures;
+  int phase, movesPicked, numOfBadCaptures;

   bool finished;
   Bitboard dc, pinned;
   bool finished;
   Bitboard dc, pinned;

+  MoveStack *curMove, *lastMove;

   MoveStack moves[256], badCaptures[64];
 };
 
   MoveStack moves[256], badCaptures[64];
 };
 


@@ -98,7 +99,7 @@ private:
 /// a single reply to check.
 
 inline int MovePicker::number_of_moves() const {
 /// a single reply to check.
 
 inline int MovePicker::number_of_moves() const {

-  return numOfMoves;
+  return int(lastMove - moves);

 }
 
 /// MovePicker::discovered_check_candidates() returns a bitboard containing
 }
 
 /// MovePicker::discovered_check_candidates() returns a bitboard containing