X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=8229e71b4a1a4e8c3c66f7cdcd12cbaa580635b2;hp=4583212c5eaa4384aa3311fca345fd34ed58c1da;hb=0347339970b68b998c7202e22c01560850dcd13e;hpb=9b43fd79372946128924ab3d42c64559e95d29d6

diff --git a/src/position.h b/src/position.h
index 4583212c..8229e71b 100644
--- a/src/position.h
+++ b/src/position.h
@@ -101,6 +101,7 @@ public:
 
   // The piece on a given square
   Piece piece_on(Square s) const;
+  Piece piece_moved(Move m) const;
   bool square_is_empty(Square s) const;
 
   // Side to move
@@ -184,15 +185,11 @@ public:
   Value non_pawn_material(Color c) const;
   Score pst_delta(Piece piece, Square from, Square to) const;
 
-  // Game termination checks
-  bool is_mate() const;
+  // Other properties of the position
   template<bool SkipRepetition> bool is_draw() const;
-
-  // Plies from start position to the beginning of search
   int startpos_ply_counter() const;
-
-  // Other properties of the position
   bool opposite_colored_bishops() const;
+  bool both_color_bishops(Color c) const;
   bool has_pawn_on_7th(Color c) const;
   bool is_chess960() const;
 
@@ -214,7 +211,7 @@ private:
   // Initialization helper functions (used while setting up a position)
   void clear();
   void put_piece(Piece p, Square s);
-  void set_castle_right(Square ksq, Square rsq);
+  void set_castle_right(Color c, Square rsq);
   bool move_is_legal(const Move m) const;
 
   // Helper template functions
@@ -278,6 +275,10 @@ inline Piece Position::piece_on(Square s) const {
   return board[s];
 }
 
+inline Piece Position::piece_moved(Move m) const {
+  return board[from_sq(m)];
+}
+
 inline bool Position::square_is_empty(Square s) const {
   return board[s] == NO_PIECE;
 }
@@ -342,29 +343,17 @@ 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 ? bishop_attacks_bb(s, occupied_squares())
+        : Pt == ROOK   ? rook_attacks_bb(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 {
@@ -392,7 +381,7 @@ inline Bitboard Position::pinned_pieces() const {
 }
 
 inline bool Position::pawn_is_passed(Color c, Square s) const {
-  return !(pieces(PAWN, flip(c)) & passed_pawn_mask(c, s));
+  return !(pieces(PAWN, ~c) & passed_pawn_mask(c, s));
 }
 
 inline Key Position::key() const {
@@ -444,6 +433,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));
 }