Cleanup pinned and friends in movegen.cpp

[stockfish] / src / movepick.cpp

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 20aaabbdde0288a28743ea230706dc2905cc281f..c90f8df1e6d398e2cf7f7ab3a4ae63be7c4f3dc1 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -130,7 +130,7 @@ Move MovePicker::get_next_move() {
         if (ttMove != MOVE_NONE)
         {
             assert(move_is_ok(ttMove));
-            if (move_is_legal(pos, ttMove, pinned))
+            if (move_is_legal(pos, ttMove))
                 return ttMove;
         }
         break;
@@ -139,7 +139,7 @@ Move MovePicker::get_next_move() {
         if (mateKiller != MOVE_NONE)
         {
             assert(move_is_ok(mateKiller));
-            if (move_is_legal(pos, mateKiller, pinned))
+            if (move_is_legal(pos, mateKiller))
                 return mateKiller;
        }
        break;
@@ -151,7 +151,7 @@ Move MovePicker::get_next_move() {
         break;
 
     case PH_BAD_CAPTURES:
-        badCapturesPicked = 0;
+        movesPicked = 0;
         break;
 
     case PH_NONCAPTURES:
@@ -174,7 +174,7 @@ Move MovePicker::get_next_move() {
         break;
 
     case PH_QCHECKS:
-        numOfMoves = generate_checks(pos, moves, dc);
+        numOfMoves = generate_checks(pos, moves);
         movesPicked = 0;
         break;
 
@@ -434,12 +434,12 @@ Move MovePicker::pick_move_from_list() {
 
   case PH_BAD_CAPTURES:
       assert(!pos.is_check());
-      assert(badCapturesPicked >= 0);
+      assert(movesPicked >= 0);
       // It's probably a good idea to use SEE move ordering here, instead
       // of just picking the first move.  FIXME
-      while (badCapturesPicked < numOfBadCaptures)
+      while (movesPicked < numOfBadCaptures)
       {
-          move = badCaptures[badCapturesPicked++].move;
+          move = badCaptures[movesPicked++].move;
           if (   move != ttMove
               && move != mateKiller
               && pos.pl_move_is_legal(move, pinned))