- // Move must not be MOVE_NONE !
- return (m & (0x1F << 12)) ? !move_is_castle(m) : !square_is_empty(move_to(m));
+ assert(m != MOVE_NONE && m != MOVE_NULL);
+ return move_is_special(m) ? !move_is_castle(m) : !square_is_empty(move_to(m));
+}
+
+inline bool Position::move_is_capture(Move m) const {
+
+ assert(m != MOVE_NONE && m != MOVE_NULL);
+
+ // Note that castle is coded as "king captures the rook"
+ return (!square_is_empty(move_to(m)) && !move_is_castle(m)) || move_is_ep(m);