Merge remote-tracking branch 'upstream/master'

[stockfish] / src / position.h

diff --git a/src/position.h b/src/position.h
index 485540ef866f9610ae9c1978701764816d90cbbc..bb45c44a3bf97e24f7507109acc9dce761b9cd48 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -125,6 +125,7 @@ public:
   // Properties of moves
   bool legal(Move m) const;
   bool pseudo_legal(const Move m) const;
+  bool capture(Move m) const;
   bool capture_stage(Move m) const;
   bool gives_check(Move m) const;
   Piece moved_piece(Move m) const;
@@ -143,6 +144,7 @@ public:
   void undo_null_move();
 
   // Static Exchange Evaluation
+  bool see_ge(Move m, Bitboard& occupied, Value threshold = VALUE_ZERO) const;
   bool see_ge(Move m, Value threshold = VALUE_ZERO) const;
 
   // Accessing hash keys
@@ -178,8 +180,8 @@ public:
 private:
   // Initialization helpers (used while setting up a position)
   void set_castling_right(Color c, Square rfrom);
-  void set_state(StateInfo* si) const;
-  void set_check_info(StateInfo* si) const;
+  void set_state() const;
+  void set_check_info() const;
 
   // Other helpers
   void move_piece(Square from, Square to);
@@ -381,14 +383,18 @@ inline bool Position::is_chess960() const {
   return chess960;
 }
 
+inline bool Position::capture(Move m) const {
+  assert(is_ok(m));
+  return     (!empty(to_sq(m)) && type_of(m) != CASTLING)
+          ||  type_of(m) == EN_PASSANT;
+}
+
 // returns true if a move is generated from the capture stage
 // having also queen promotions covered, i.e. consistency with the capture stage move generation
 // is needed to avoid the generation of duplicate moves.
 inline bool Position::capture_stage(Move m) const {
   assert(is_ok(m));
-  return     (!empty(to_sq(m)) && type_of(m) != CASTLING)
-          || (type_of(m) == PROMOTION && promotion_type(m) == QUEEN)
-          ||  type_of(m) == EN_PASSANT;
+  return  capture(m) || promotion_type(m) == QUEEN;
 }
 
 inline Piece Position::captured_piece() const {