X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=488ed09f0a649b5dd4f9ff7e16904eea3497697b;hp=d2ad99557427dedae4dcd3cbebcd23d1e070b8db;hb=7bc36887144bc6a682e54a91044641f913176449;hpb=fc3ea7365ad95ec1da05ac559e4e659cf8a7f0f9 diff --git a/src/position.h b/src/position.h index d2ad9955..488ed09f 100644 --- a/src/position.h +++ b/src/position.h @@ -231,7 +231,6 @@ private: // Bitboards Bitboard byTypeBB[8]; // [pieceType] Bitboard byColorBB[2]; // [color] - Bitboard occupied; // Piece counts int pieceCount[2][8]; // [color][pieceType] @@ -286,7 +285,7 @@ inline Color Position::side_to_move() const { } inline Bitboard Position::pieces() const { - return occupied; + return byTypeBB[ALL_PIECES]; } 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 { - return occupied & castlePath[f]; + return byTypeBB[ALL_PIECES] & castlePath[f]; } inline Square Position::castle_rook_square(CastleRight f) const { @@ -354,11 +353,11 @@ inline Bitboard Position::attacks_from(Square s, Color c) 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 { - return attackers_to(s, occupied); + return attackers_to(s, byTypeBB[ALL_PIECES]); } inline Bitboard Position::checkers() const {