X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=2930b8c853fdb7927c911fbc16d5a467dbc87d6e;hp=14e6b95c3136fd7dc14be38b9359df3aa980ad33;hb=c2c185423b13b0227c86009c6006e48e8d258896;hpb=3185c36a6554390d9061f1d74eb16a6c39caefb4

diff --git a/src/position.h b/src/position.h
index 14e6b95c..2930b8c8 100644
--- a/src/position.h
+++ b/src/position.h
@@ -48,10 +48,10 @@ class Position;
 
 struct StateInfo {
   Key pawnKey, materialKey;
-  int castleRights, rule50, gamePly, pliesFromNull;
-  Square epSquare;
-  Score value;
   Value npMaterial[2];
+  int castleRights, rule50, pliesFromNull;
+  Score value;
+  Square epSquare;
 
   Key key;
   Bitboard checkersBB;
@@ -188,8 +188,8 @@ public:
   bool is_mate() const;
   template<bool SkipRepetition> bool is_draw() const;
 
-  // Number of plies from starting position
-  int game_ply() const;
+  // Plies from start position to the beginning of search
+  int startpos_ply_counter() const;
 
   // Other properties of the position
   bool opposite_colored_bishops() const;
@@ -204,7 +204,7 @@ public:
 
   // Position consistency check, for debugging
   bool is_ok(int* failedStep = NULL) const;
-  void flip();
+  void flip_me();
 
   // Global initialization
   static void init();
@@ -255,6 +255,7 @@ private:
   Square castleRookSquare[16]; // [castleRight]
   StateInfo startState;
   int64_t nodes;
+  int startPosPly;
   Color sideToMove;
   int threadID;
   StateInfo* st;
@@ -379,7 +380,7 @@ inline bool Position::in_check() const {
 }
 
 inline bool Position::pawn_is_passed(Color c, Square s) const {
-  return !(pieces(PAWN, opposite_color(c)) & passed_pawn_mask(c, s));
+  return !(pieces(PAWN, flip(c)) & passed_pawn_mask(c, s));
 }
 
 inline Key Position::get_key() const {
@@ -421,8 +422,8 @@ inline bool Position::move_is_passed_pawn_push(Move m) const {
         && pawn_is_passed(c, move_to(m));
 }
 
-inline int Position::game_ply() const {
-  return st->gamePly;
+inline int Position::startpos_ply_counter() const {
+  return startPosPly + st->pliesFromNull; // HACK
 }
 
 inline bool Position::opposite_colored_bishops() const {