Restore startpos_ply_counter() instead of full_moves()

[stockfish] / src / movepick.cpp

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 208007cca24e84d7a54ac0ef1c4844b23e844161..07e8ef9d97290b68db0bb17076dfd11fd00b1374 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -237,7 +237,7 @@ void MovePicker::score_captures() {
   {
       m = cur->move;
       cur->score =  piece_value_midgame(pos.piece_on(move_to(m)))
-                  - pos.type_of_piece_on(move_from(m));
+                  - piece_type(pos.piece_on(move_from(m)));
 
       if (move_is_promotion(m))
           cur->score += QueenValueMidgame;
@@ -276,7 +276,7 @@ void MovePicker::score_evasions() {
           cur->score = seeScore - History::MaxValue; // Be sure we are at the bottom
       else if (pos.move_is_capture(m))
           cur->score =  piece_value_midgame(pos.piece_on(move_to(m)))
-                      - pos.type_of_piece_on(move_from(m)) + History::MaxValue;
+                      - piece_type(pos.piece_on(move_from(m))) + History::MaxValue;
       else
           cur->score = H.value(pos.piece_on(move_from(m)), move_to(m));
   }