X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=30c25652f5b2455f966cd6767d9ae5011c43b814;hp=48e8fbe419baf62ff913f06e2f4a8c44e55bfc7c;hb=34178205fc762638e633a61ecc45360e1662bdee;hpb=4aadd1e401375a8075fbe80edc7060a13a0f7a5d diff --git a/src/position.h b/src/position.h index 48e8fbe4..30c25652 100644 --- a/src/position.h +++ b/src/position.h @@ -127,6 +127,7 @@ public: // Castling rights bool can_castle(CastleRight f) const; bool can_castle(Color c) const; + bool castle_impeded(CastleRight f) const; Square castle_rook_square(CastleRight f) const; // Bitboards for pinned pieces and discovered check candidates @@ -191,10 +192,7 @@ public: bool both_color_bishops(Color c) const; bool has_pawn_on_7th(Color c) const; bool is_chess960() const; - - // Current thread ID searching on the position int thread() const; - int64_t nodes_searched() const; void set_nodes_searched(int64_t n); @@ -210,7 +208,7 @@ private: // Initialization helper functions (used while setting up a position) void clear(); void put_piece(Piece p, Square s); - void set_castle_right(Color c, Square rsq); + void set_castle_right(Color c, Square rfrom); bool move_is_legal(const Move m) const; // Helper template functions @@ -245,6 +243,7 @@ private: // Other info int castleRightsMask[64]; // [square] Square castleRookSquare[16]; // [castleRight] + Bitboard castlePath[16]; // [castleRight] StateInfo startState; int64_t nodes; int startPosPly; @@ -334,6 +333,10 @@ inline bool Position::can_castle(Color c) const { return st->castleRights & ((WHITE_OO | WHITE_OOO) << c); } +inline bool Position::castle_impeded(CastleRight f) const { + return occupied & castlePath[f]; +} + inline Square Position::castle_rook_square(CastleRight f) const { return castleRookSquare[f]; }