X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=22845ba2a2a86f3f3cfb86c9ed0428fee21de582;hp=cea4efb4bebd1a00deb723e4920d7306db09aa42;hb=bbb24625764619e5886ce0250739a4c9bfdb4d33;hpb=3a4d6e2034a872d9c8550a5024bacb3bd27dcad3

diff --git a/src/movepick.cpp b/src/movepick.cpp
index cea4efb4..22845ba2 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -268,20 +268,23 @@ void MovePicker::score_noncaptures() {
   // First score by history, when no history is available then use
   // piece/square tables values. This seems to be better then a
   // random choice when we don't have an history for any move.
-  Move m;
+  Piece piece;
+  Square from, to;
   int hs;
 
   for (int i = 0; i < numOfMoves; i++)
   {
-      m = moves[i].move;
-      hs = H.move_ordering_score(pos.piece_on(move_from(m)), move_to(m));
+      from = move_from(moves[i].move);
+      to = move_to(moves[i].move);
+      piece = pos.piece_on(from);
+      hs = H.move_ordering_score(piece, to);
 
       // Ensure history is always preferred to pst
       if (hs > 0)
           hs += 1000;
 
       // pst based scoring
-      moves[i].score = hs + pos.mg_pst_delta(m);
+      moves[i].score = hs + pos.pst_delta<Position::MidGame>(piece, from, to);
   }
 }