X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=650218f48f468f4d36bbae33a6167c219c890d70;hp=638f81757d2af94d72c9b0c6739ab1d191d2c6f5;hb=d8e5b8c133be7e49b47236a83f82e0cd6290c20c;hpb=252844e899515d48c0db1153ef5e91bdd8c6679f

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 638f8175..650218f4 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -213,7 +213,6 @@ void MovePicker::score_noncaptures() {
   Move m;
   Piece piece;
   Square from, to;
-  int hs;
 
   for (MoveStack* cur = moves; cur != lastMove; cur++)
   {
@@ -221,14 +220,7 @@ void MovePicker::score_noncaptures() {
       from = move_from(m);
       to = move_to(m);
       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
-      cur->score = hs + mg_value(pos.pst_delta(piece, from, to));
+      cur->score = H.move_ordering_score(piece, to);
   }
 }
 
@@ -248,7 +240,7 @@ void MovePicker::score_evasions_or_checks() {
   {
       m = cur->move;
       if ((seeScore = pos.see_sign(m)) < 0)
-          cur->score = seeScore;
+          cur->score = seeScore - HistoryMax; // Be sure 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)) + HistoryMax;