Revert to byTypeBB[0] storing occupied squares

[stockfish] / src / position.h

diff --git a/src/position.h b/src/position.h
index d2ad99557427dedae4dcd3cbebcd23d1e070b8db..488ed09f0a649b5dd4f9ff7e16904eea3497697b 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -231,7 +231,6 @@ private:
   // Bitboards
   Bitboard byTypeBB[8];        // [pieceType]
   Bitboard byColorBB[2];       // [color]
   // Bitboards
   Bitboard byTypeBB[8];        // [pieceType]
   Bitboard byColorBB[2];       // [color]

-  Bitboard occupied;

 
   // Piece counts
   int pieceCount[2][8];        // [color][pieceType]
 
   // Piece counts
   int pieceCount[2][8];        // [color][pieceType]


@@ -286,7 +285,7 @@ inline Color Position::side_to_move() const {
 }
 
 inline Bitboard Position::pieces() const {
 }
 
 inline Bitboard Position::pieces() const {

-  return occupied;
+  return byTypeBB[ALL_PIECES];

 }
 
 inline Bitboard Position::pieces(Color c) const {
 }
 
 inline Bitboard Position::pieces(Color c) const {


@@ -334,7 +333,7 @@ inline bool Position::can_castle(Color c) const {
 }
 
 inline bool Position::castle_impeded(CastleRight f) const {
 }
 
 inline bool Position::castle_impeded(CastleRight f) const {

-  return occupied & castlePath[f];
+  return byTypeBB[ALL_PIECES] & castlePath[f];

 }
 
 inline Square Position::castle_rook_square(CastleRight f) const {
 }
 
 inline Square Position::castle_rook_square(CastleRight f) const {


@@ -354,11 +353,11 @@ inline Bitboard Position::attacks_from<PAWN>(Square s, Color c) const {
 }
 
 inline Bitboard Position::attacks_from(Piece p, Square s) const {
 }
 
 inline Bitboard Position::attacks_from(Piece p, Square s) const {

-  return attacks_from(p, s, occupied);
+  return attacks_from(p, s, byTypeBB[ALL_PIECES]);

 }
 
 inline Bitboard Position::attackers_to(Square s) const {
 }
 
 inline Bitboard Position::attackers_to(Square s) const {

-  return attackers_to(s, occupied);
+  return attackers_to(s, byTypeBB[ALL_PIECES]);

 }
 
 inline Bitboard Position::checkers() const {
 }
 
 inline Bitboard Position::checkers() const {