X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=ce603d188ce5ad3d5e7add57ac1b00c4c2d599e8;hp=4e31037c0af48d39f9319a36d8fc2a857b358ef4;hb=64d29a633066e39b62af5ee0bbf32645994744ec;hpb=f12449d492f75a83f9cd3a24cdb461bc3595536f

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 4e31037c..ce603d18 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -81,7 +81,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats&
   followupmoves = fm;
   ss = s;
 
-  if (p.checkers())
+  if (pos.checkers())
       stage = EVASION;
 
   else
@@ -92,11 +92,11 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats&
 }
 
 MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h,
-                       Square sq) : pos(p), history(h), cur(moves), end(moves) {
+                       Square s) : pos(p), history(h), cur(moves), end(moves) {
 
   assert(d <= DEPTH_ZERO);
 
-  if (p.checkers())
+  if (pos.checkers())
       stage = EVASION;
 
   else if (d > DEPTH_QS_NO_CHECKS)
@@ -115,7 +115,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats&
   else
   {
       stage = RECAPTURE;
-      recaptureSquare = sq;
+      recaptureSquare = s;
       ttm = MOVE_NONE;
   }
 
@@ -165,7 +165,7 @@ void MovePicker::score<CAPTURES>() {
   {
       m = it->move;
       it->value =  PieceValue[MG][pos.piece_on(to_sq(m))]
-                 - type_of(pos.moved_piece(m));
+                 - Value(type_of(pos.moved_piece(m)));
 
       if (type_of(m) == PROMOTION)
           it->value += PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN];
@@ -203,7 +203,7 @@ void MovePicker::score<EVASIONS>() {
 
       else if (pos.capture(m))
           it->value =  PieceValue[MG][pos.piece_on(to_sq(m))]
-                     - type_of(pos.moved_piece(m)) + HistoryStats::Max;
+                     - Value(type_of(pos.moved_piece(m))) + HistoryStats::Max;
       else
           it->value = history[pos.moved_piece(m)][to_sq(m)];
   }