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

diff --git a/src/position.h b/src/position.h
index 8229e71b..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;
@@ -257,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;
@@ -291,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];
 }
@@ -345,10 +340,9 @@ inline Square Position::castle_rook_square(CastleRight f) const {
 
 template<PieceType Pt>
 inline Bitboard Position::attacks_from(Square s) const {
-  return  Pt == BISHOP ? bishop_attacks_bb(s, occupied_squares())
-        : Pt == ROOK   ? rook_attacks_bb(s, occupied_squares())
+  return  Pt == BISHOP || Pt == ROOK ? attacks_bb<Pt>(s, occupied_squares())
         : Pt == QUEEN  ? attacks_from<ROOK>(s) | attacks_from<BISHOP>(s)
-                       : StepAttacksBB[Pt][s];
+        : StepAttacksBB[Pt][s];
 }
 
 template<>
@@ -357,11 +351,11 @@ inline Bitboard Position::attacks_from<PAWN>(Square s, Color c) const {
 }
 
 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 {