diff --git a/src/movepick.cpp b/src/movepick.cpp index 638f8175..901aa60e 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); } }