Clarify definition of capture_or_promotion()

[stockfish] / src / position.h

diff --git a/src/position.h b/src/position.h
index 6defeb22bd9cedc8fbab20b6a50c28773974bc0e..9a88e1b215c06d1b4660db5012c04c0abb6c514a 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -327,7 +327,8 @@ inline bool Position::pawn_passed(Color c, Square s) const {
 }
 
 inline bool Position::advanced_pawn_push(Move m) const {
-  return pieces(PAWN) & TheirHalf[sideToMove] & from_sq(m);
+  return   type_of(moved_piece(m)) == PAWN
+        && relative_rank(sideToMove, from_sq(m)) > RANK_4;
 }
 
 inline Key Position::key() const {
@@ -378,7 +379,7 @@ inline bool Position::is_chess960() const {
 inline bool Position::capture_or_promotion(Move m) const {
 
   assert(is_ok(m));
-  return type_of(m) ? type_of(m) != CASTLING : !empty(to_sq(m));
+  return type_of(m) != NORMAL ? type_of(m) != CASTLING : !empty(to_sq(m));
 }
 
 inline bool Position::capture(Move m) const {