X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmovepick.cpp;h=07e8ef9d97290b68db0bb17076dfd11fd00b1374;hb=8094b2add88cd681f3cdc7896990633b54c6ff48;hp=1a8f5bf60ea4a9cc50c6ed7e5b666f04d4992277;hpb=6a1707889c19bf37a0ef84fb67ffc57e6168e34d;p=stockfish

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 1a8f5bf6..07e8ef9d 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -118,13 +118,13 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h, S
   go_next_phase();
 }
 
-MovePicker::MovePicker(const Position& p, Move ttm, const History& h, int parentCapture)
+MovePicker::MovePicker(const Position& p, Move ttm, const History& h, PieceType parentCapture)
                        : pos(p), H(h) {
 
   assert (!pos.in_check());
 
   // In ProbCut we consider only captures better than parent's move
-  captureThreshold = parentCapture;
+  captureThreshold = piece_value_midgame(Piece(parentCapture));
   phasePtr = ProbCutTable;
 
   if (   ttm != MOVE_NONE
@@ -236,8 +236,8 @@ void MovePicker::score_captures() {
   for (MoveStack* cur = moves; cur != lastMove; cur++)
   {
       m = cur->move;
-      cur->score =  pos.midgame_value_of_piece_on(move_to(m))
-                  - pos.type_of_piece_on(move_from(m));
+      cur->score =  piece_value_midgame(pos.piece_on(move_to(m)))
+                  - piece_type(pos.piece_on(move_from(m)));
 
       if (move_is_promotion(m))
           cur->score += QueenValueMidgame;
@@ -275,8 +275,8 @@ void MovePicker::score_evasions() {
       if ((seeScore = pos.see_sign(m)) < 0)
           cur->score = seeScore - History::MaxValue; // Be sure we are at the bottom
       else if (pos.move_is_capture(m))
-          cur->score =  pos.midgame_value_of_piece_on(move_to(m))
-                      - pos.type_of_piece_on(move_from(m)) + History::MaxValue;
+          cur->score =  piece_value_midgame(pos.piece_on(move_to(m)))
+                      - piece_type(pos.piece_on(move_from(m))) + History::MaxValue;
       else
           cur->score = H.value(pos.piece_on(move_from(m)), move_to(m));
   }