X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=7842ed8b337254ea5d2db61f537644056146e212;hp=8af624ca78c3a8f27480c75b68a3b3eb36781d17;hb=ac7339877b3e083b5dd93f34ec79779d43f784ae;hpb=fd5d6c53402517cf8277641a8e37af153b7540c5

diff --git a/src/position.h b/src/position.h
index 8af624ca..7842ed8b 100644
--- a/src/position.h
+++ b/src/position.h
@@ -216,11 +216,9 @@ private:
   void set_castle_right(Square ksq, Square rsq);
   bool move_is_legal(const Move m) const;
 
-  // Helper functions for doing and undoing moves
+  // Helper template functions
   template<bool Do> void do_castle_move(Move m);
-
-  template<bool FindPinned>
-  Bitboard hidden_checkers() const;
+  template<bool FindPinned> Bitboard hidden_checkers() const;
 
   // Computing hash keys from scratch (for initialization and debugging)
   Key compute_key() const;
@@ -238,6 +236,7 @@ private:
   // Bitboards
   Bitboard byTypeBB[8];        // [pieceType]
   Bitboard byColorBB[2];       // [color]
+  Bitboard occupied;
 
   // Piece counts
   int pieceCount[2][8];        // [color][pieceType]
@@ -287,11 +286,11 @@ inline Color Position::side_to_move() const {
 }
 
 inline Bitboard Position::occupied_squares() const {
-  return byTypeBB[0];
+  return occupied;
 }
 
 inline Bitboard Position::empty_squares() const {
-  return ~byTypeBB[0];
+  return ~occupied;
 }
 
 inline Bitboard Position::pieces(Color c) const {
@@ -383,6 +382,14 @@ inline bool Position::in_check() const {
   return st->checkersBB != 0;
 }
 
+inline Bitboard Position::discovered_check_candidates() const {
+  return hidden_checkers<false>();
+}
+
+inline Bitboard Position::pinned_pieces() const {
+  return hidden_checkers<true>();
+}
+
 inline bool Position::pawn_is_passed(Color c, Square s) const {
   return !(pieces(PAWN, flip(c)) & passed_pawn_mask(c, s));
 }