X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fposition.h;h=0aac1c36609a19c5dcaba5e9e0f739209c9c4bdf;hb=87379c2929c1d7f3a35aae4ed1115e98fcde388a;hp=c946cb6ab789030dd7bed423000b7b864e6085d8;hpb=9fc602bae74b8e09bd45ace3b42a8ce84d56b23c;p=stockfish diff --git a/src/position.h b/src/position.h index c946cb6a..0aac1c36 100644 --- a/src/position.h +++ b/src/position.h @@ -70,9 +70,9 @@ struct CheckInfo { CheckInfo(const Position&); - Square ksq; Bitboard dcCandidates; Bitboard checkSq[8]; + Square ksq; }; /// Castle rights, encoded as bit fields @@ -105,8 +105,8 @@ struct StateInfo { Score value; Value npMaterial[2]; - Key key; PieceType capture; + Key key; Bitboard checkersBB; StateInfo* previous; }; @@ -156,7 +156,6 @@ public: void print(Move m = MOVE_NONE) const; // Copying - void fast_copy(const Position& pos); void flipped_copy(const Position& pos); // The piece on a given square @@ -329,12 +328,12 @@ private: Color sideToMove; int gamePly; Key history[MaxGameLength]; - File initialKFile, initialKRFile, initialQRFile; + int castleRightsMask[64]; StateInfo startState; + File initialKFile, initialKRFile, initialQRFile; StateInfo* st; // Static variables - static int castleRightsMask[64]; static Key zobrist[2][8][64]; static Key zobEp[64]; static Key zobCastle[16]; @@ -413,8 +412,8 @@ inline int Position::piece_count(Color c, PieceType pt) const { return pieceCount[c][pt]; } -inline Square Position::piece_list(Color c, PieceType pt, int index) const { - return pieceList[c][pt][index]; +inline Square Position::piece_list(Color c, PieceType pt, int idx) const { + return pieceList[c][pt][idx]; } inline const Square* Position::piece_list_begin(Color c, PieceType pt) const {