Retire move_is_capture_or_promotion()

[stockfish] / src / movepick.cpp

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 8872e39f3691a8740a8ba1244f8fc3c4664951c5..4be0f69a6ba5eef513fc02cbfd888c9ffb9e6357 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -65,7 +65,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h,
 
   pinned = p.pinned_pieces(pos.side_to_move());
 
-  if (p.is_check())
+  if (p.in_check())
   {
       ttMoves[1].move = killers[0].move = killers[1].move = MOVE_NONE;
       phasePtr = EvasionTable;
@@ -99,7 +99,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h)
 
   pinned = p.pinned_pieces(pos.side_to_move());
 
-  if (p.is_check())
+  if (p.in_check())
       phasePtr = EvasionTable;
   else if (d >= DEPTH_QS_CHECKS)
       phasePtr = QsearchWithChecksTable;
@@ -110,7 +110,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h)
       // Skip TT move if is not a capture or a promotion, this avoids
       // qsearch tree explosion due to a possible perpetual check or
       // similar rare cases when TT table is full.
-      if (ttm != MOVE_NONE && !pos.move_is_capture_or_promotion(ttm))
+      if (ttm != MOVE_NONE && !pos.move_is_capture(ttm) && !move_is_promotion(ttm))
           searchTT = ttMoves[0].move = MOVE_NONE;
   }
 
@@ -157,7 +157,7 @@ void MovePicker::go_next_phase() {
       return;
 
   case PH_EVASIONS:
-      assert(pos.is_check());
+      assert(pos.in_check());
       lastMove = generate<MV_EVASION>(pos, moves);
       score_evasions();
       return;