X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=606c7486fc8563db19d155541435f236de61415c;hp=a051ec382f49fe15a0d3ee55238e97a48c1158ac;hb=f05d059b17c8c0614517608c1e1f585dc95597e9;hpb=e4277c06bfb783b5ec78001eeef06fa9feae033f

diff --git a/src/position.h b/src/position.h
index a051ec38..606c7486 100644
--- a/src/position.h
+++ b/src/position.h
@@ -88,8 +88,8 @@ enum Phase {
 
 struct StateInfo {
   Key key, pawnKey, materialKey;
-  int castleRights, rule50;
-  Square kingSquare[2], epSquare;
+  int castleRights, rule50, pliesFromNull;
+  Square epSquare;
   Value mgValue, egValue;
   Value npMaterial[2];
 
@@ -193,6 +193,7 @@ public:
 
   // Piece lists
   Square piece_list(Color c, PieceType pt, int index) const;
+  const Square* piece_list_begin(Color c, PieceType pt) const;
 
   // Information about attacks to or from a given square
   Bitboard attackers_to(Square s) const;
@@ -298,12 +299,12 @@ private:
   template<GamePhase> Value compute_value() const;
   Value compute_non_pawn_material(Color c) const;
 
-  // Bitboards
-  Bitboard byColorBB[2], byTypeBB[8];
-
   // Board
   Piece board[64];
 
+  // Bitboards
+  Bitboard byTypeBB[8], byColorBB[2];
+
   // Piece counts
   int pieceCount[2][8]; // [color][pieceType]
 
@@ -403,12 +404,16 @@ inline Square Position::piece_list(Color c, PieceType pt, int index) const {
   return pieceList[c][pt][index];
 }
 
+inline const Square* Position::piece_list_begin(Color c, PieceType pt) const {
+  return pieceList[c][pt];
+}
+
 inline Square Position::ep_square() const {
   return st->epSquare;
 }
 
 inline Square Position::king_square(Color c) const {
-  return st->kingSquare[c];
+  return pieceList[c][KING][0];
 }
 
 inline bool Position::can_castle_kingside(Color side) const {