X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovepick.cpp;h=a86a1702f19d1df5ee61868a78cc93052f38b8dc;hb=cdfe43eb8ff6f8b4315442318a4259deb4614167;hp=37775faa33aa666e8b0bea1b4eb9e9d23cee2690;hpb=24b25b4827df4b3629d46ef019f4fea645d6dc91;p=stockfish

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 37775faa..a86a1702 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -167,20 +167,18 @@ void MovePicker::score_captures() {
                   - type_of(pos.piece_moved(m));
 
       if (is_promotion(m))
-          cur->score += PieceValueMidgame[promotion_piece_type(m)];
+          cur->score += PieceValueMidgame[promotion_type(m)];
   }
 }
 
 void MovePicker::score_noncaptures() {
 
   Move m;
-  Square from;
 
   for (MoveStack* cur = moves; cur != lastMove; cur++)
   {
       m = cur->move;
-      from = from_sq(m);
-      cur->score = H.value(pos.piece_on(from), to_sq(m));
+      cur->score = H.value(pos.piece_moved(m), to_sq(m));
   }
 }
 
@@ -306,9 +304,9 @@ Move MovePicker::next_move() {
 
       case KILLERS_S1:
           move = (curMove++)->move;
-          if (   move != MOVE_NONE
-              && pos.is_pseudo_legal(move)
-              && move != ttMove
+          if (    move != MOVE_NONE
+              &&  pos.is_pseudo_legal(move)
+              &&  move != ttMove
               && !pos.is_capture(move))
               return move;
           break;