X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=48e8fbe419baf62ff913f06e2f4a8c44e55bfc7c;hp=c391d8247c72f4530d78d942a1d087eb1d472180;hb=4aadd1e401375a8075fbe80edc7060a13a0f7a5d;hpb=d98150dffc69a810b0b842244aec0d29deddabfb

diff --git a/src/position.h b/src/position.h
index c391d824..48e8fbe4 100644
--- a/src/position.h
+++ b/src/position.h
@@ -108,7 +108,6 @@ public:
   Color side_to_move() const;
 
   // Bitboard representation of the position
-  Bitboard empty_squares() const;
   Bitboard occupied_squares() const;
   Bitboard pieces(Color c) const;
   Bitboard pieces(PieceType pt) const;
@@ -189,6 +188,7 @@ public:
   template<bool SkipRepetition> bool is_draw() const;
   int startpos_ply_counter() const;
   bool opposite_colored_bishops() const;
+  bool both_color_bishops(Color c) const;
   bool has_pawn_on_7th(Color c) const;
   bool is_chess960() const;
 
@@ -256,7 +256,7 @@ private:
   // Static variables
   static Score pieceSquareTable[16][64]; // [piece][square]
   static Key zobrist[2][8][64];          // [color][pieceType][square]/[piece count]
-  static Key zobEp[64];                  // [square]
+  static Key zobEp[8];                   // [file]
   static Key zobCastle[16];              // [castleRight]
   static Key zobSideToMove;
   static Key zobExclusion;
@@ -290,10 +290,6 @@ inline Bitboard Position::occupied_squares() const {
   return occupied;
 }
 
-inline Bitboard Position::empty_squares() const {
-  return ~occupied;
-}
-
 inline Bitboard Position::pieces(Color c) const {
   return byColorBB[c];
 }
@@ -342,37 +338,24 @@ inline Square Position::castle_rook_square(CastleRight f) const {
   return castleRookSquare[f];
 }
 
-template<>
-inline Bitboard Position::attacks_from<PAWN>(Square s, Color c) const {
-  return StepAttacksBB[make_piece(c, PAWN)][s];
-}
-
-template<PieceType Piece> // Knight and King and white pawns
+template<PieceType Pt>
 inline Bitboard Position::attacks_from(Square s) const {
-  return StepAttacksBB[Piece][s];
+  return  Pt == BISHOP || Pt == ROOK ? attacks_bb<Pt>(s, occupied_squares())
+        : Pt == QUEEN  ? attacks_from<ROOK>(s) | attacks_from<BISHOP>(s)
+        : StepAttacksBB[Pt][s];
 }
 
 template<>
-inline Bitboard Position::attacks_from<BISHOP>(Square s) const {
-  return bishop_attacks_bb(s, occupied_squares());
-}
-
-template<>
-inline Bitboard Position::attacks_from<ROOK>(Square s) const {
-  return rook_attacks_bb(s, occupied_squares());
-}
-
-template<>
-inline Bitboard Position::attacks_from<QUEEN>(Square s) const {
-  return attacks_from<ROOK>(s) | attacks_from<BISHOP>(s);
+inline Bitboard Position::attacks_from<PAWN>(Square s, Color c) const {
+  return StepAttacksBB[make_piece(c, PAWN)][s];
 }
 
 inline Bitboard Position::attacks_from(Piece p, Square s) const {
-  return attacks_from(p, s, occupied_squares());
+  return attacks_from(p, s, occupied);
 }
 
 inline Bitboard Position::attackers_to(Square s) const {
-  return attackers_to(s, occupied_squares());
+  return attackers_to(s, occupied);
 }
 
 inline Bitboard Position::checkers() const {
@@ -444,6 +427,12 @@ inline bool Position::opposite_colored_bishops() const {
         && opposite_colors(pieceList[WHITE][BISHOP][0], pieceList[BLACK][BISHOP][0]);
 }
 
+inline bool Position::both_color_bishops(Color c) const {
+  // Assumes that there are only two bishops
+  return  pieceCount[c][BISHOP] >= 2 &&
+          opposite_colors(pieceList[c][BISHOP][0], pieceList[c][BISHOP][1]);
+}
+
 inline bool Position::has_pawn_on_7th(Color c) const {
   return pieces(PAWN, c) & rank_bb(relative_rank(c, RANK_7));
 }