Restore startpos_ply_counter() instead of full_moves()

[stockfish] / src / position.h

diff --git a/src/position.h b/src/position.h
index 0cc6a0ca7a91fdbc4658bbade5eb763233f13007..f326e4fbaa99b3fa27955abc6948398511dfb24b 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -58,9 +58,9 @@ struct StateInfo {
   Score value;
   Value npMaterial[2];
 
-  PieceType capturedType;
   Key key;
   Bitboard checkersBB;
+  PieceType capturedType;
   StateInfo* previous;
 };
 
@@ -193,7 +193,7 @@ public:
   template<bool SkipRepetition> bool is_draw() const;
 
   // Number of plies from starting position
-  int full_moves() const;
+  int startpos_ply_counter() const;
 
   // Other properties of the position
   bool opposite_colored_bishops() const;
@@ -256,16 +256,16 @@ private:
   int index[64];               // [square]
 
   // Other info
-  Color sideToMove;
   Key history[MaxGameLength];
   int castleRightsMask[64];    // [square]
   Square castleRookSquare[16]; // [castleRight]
   StateInfo startState;
-  bool chess960;
+  int64_t nodes;
+  Color sideToMove;
   int fullMoves;
   int threadID;
-  int64_t nodes;
   StateInfo* st;
+  int chess960;
 
   // Static variables
   static Score pieceSquareTable[16][64]; // [piece][square]
@@ -428,8 +428,8 @@ inline bool Position::move_is_passed_pawn_push(Move m) const {
         && pawn_is_passed(c, move_to(m));
 }
 
-inline int Position::full_moves() const {
-  return fullMoves;
+inline int Position::startpos_ply_counter() const {
+  return Max(2 * (fullMoves - 1), 0) + int(sideToMove == BLACK);
 }
 
 inline bool Position::opposite_colored_bishops() const {