X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=b65522b79a8e7860817fb2ebc92737d628ac6f31;hp=d94ef185ac9c45a47de27148ce34f8dfe0ff3685;hb=ea5505821dabb70eb01cc25f7b4489b0fdc17d2b;hpb=e917bd59b1e317c6b48dc676473359fdfb86d9d4

diff --git a/src/position.h b/src/position.h
index d94ef185..b65522b7 100644
--- a/src/position.h
+++ b/src/position.h
@@ -265,7 +265,7 @@ inline bool Position::can_castle(CastlingRight cr) const {
 }
 
 inline int Position::castling_rights(Color c) const {
-  return st->castlingRights & ((WHITE_OO | WHITE_OOO) << (2 * c));
+  return st->castlingRights & (c == WHITE ? WHITE_CASTLING : BLACK_CASTLING);
 }
 
 inline bool Position::castling_impeded(CastlingRight cr) const {
@@ -310,7 +310,7 @@ inline Bitboard Position::check_squares(PieceType pt) const {
 }
 
 inline bool Position::pawn_passed(Color c, Square s) const {
-  return !(pieces(~c, PAWN) & passed_pawn_mask(c, s));
+  return !(pieces(~c, PAWN) & passed_pawn_span(c, s));
 }
 
 inline bool Position::advanced_pawn_push(Move m) const {