X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=8e29eb13458390ff2d4a405ffd61cebd794f46ee;hp=11d31f8a80d17cb445f9d24e89bfd8f36393c0fd;hb=772a37cd54212a7b045781b69eb190bd5d4e3161;hpb=f9f30412e798b4ba06375a383a85a9e65bfe299f diff --git a/src/position.h b/src/position.h index 11d31f8a..8e29eb13 100644 --- a/src/position.h +++ b/src/position.h @@ -79,14 +79,15 @@ enum CastleRights { /// must be passed as a parameter. struct StateInfo { - Bitboard pinners[2], pinned[2], dcCandidates[2], checkersBB; Key key, pawnKey, materialKey; int castleRights, rule50; Square epSquare; Value mgValue, egValue; + PieceType capture; - StateInfo* previous; + Bitboard checkersBB; Move lastMove; + StateInfo* previous; }; @@ -219,7 +220,9 @@ public: // Properties of moves bool pl_move_is_legal(Move m) const; + bool pl_move_is_legal(Move m, Bitboard pinned) const; bool move_is_check(Move m) const; + bool move_is_check(Move m, Bitboard dcCandidates) const; bool move_is_capture(Move m) const; bool move_is_deep_pawn_push(Move m) const; bool move_is_pawn_push_to_7th(Move m) const; @@ -242,6 +245,7 @@ public: // Doing and undoing moves void setStartState(const StateInfo& st); void do_move(Move m, StateInfo& st); + void do_move(Move m, StateInfo& st, Bitboard dcCandidates); void undo_move(Move m); void do_null_move(StateInfo& st); void undo_null_move(); @@ -288,6 +292,7 @@ public: static void init_piece_square_tables(); private: + // Initialization helper functions (used while setting up a position) void clear(); void put_piece(Piece p, Square s); @@ -303,9 +308,6 @@ private: void undo_promotion_move(Move m); void undo_ep_move(Move m); void find_checkers(); - void find_hidden_checks(Color us); - void find_hidden_checks(); - void update_hidden_checks(Square from, Square to); template void update_checkers(Bitboard* pCheckersBB, Square ksq, Square from, Square to, Bitboard dcCandidates); @@ -560,19 +562,6 @@ inline Bitboard Position::piece_attacks(Square s) const { return StepAttackBB[KING][s]; } -inline Bitboard Position::pinned_pieces(Color c) const { - return st->pinned[c]; -} - -inline Bitboard Position::pinned_pieces(Color c, Bitboard& p) const { - p = st->pinners[c]; - return st->pinned[c]; -} - -inline Bitboard Position::discovered_check_candidates(Color c) const { - return st->dcCandidates[c]; -} - inline Bitboard Position::checkers() const { return st->checkersBB; }