X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=04e5fb5e4a89a79474e91524777b6da2608338c7;hp=f989121f378f474551227f7c173d6ec3d3cc9a98;hb=54f1c383d36f461a740eeaa93856b408e8d3faa3;hpb=a4a0ffce711962c0b04b35998c3c06491be373bf

diff --git a/src/movepick.h b/src/movepick.h
index f989121f..04e5fb5e 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -17,22 +17,12 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined MOVEPICK_H_INCLUDED
 #define MOVEPICK_H_INCLUDED
 
-////
-//// Includes
-////
-
-#include "depth.h"
 #include "history.h"
 #include "position.h"
-
-
-////
-//// Types
-////
+#include "types.h"
 
 struct SearchStack;
 
@@ -49,14 +39,14 @@ class MovePicker {
   MovePicker& operator=(const MovePicker&); // silence a warning under MSVC
 
 public:
-  MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL, Value beta = -VALUE_INFINITE);
+  MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss, Value beta);
+  MovePicker(const Position& p, Move ttm, Depth d, const History& h);
   Move get_next_move();
-  int number_of_evasions() const;
 
 private:
   void score_captures();
   void score_noncaptures();
-  void score_evasions_or_checks();
+  void score_evasions();
   void go_next_phase();
 
   const Position& pos;
@@ -65,23 +55,8 @@ private:
   MoveStack ttMoves[2], killers[2];
   int badCaptureThreshold, phase;
   const uint8_t* phasePtr;
-  MoveStack *curMove, *lastMove, *lastGoodNonCapture, *lastBadCapture;
-  MoveStack moves[256], badCaptures[64];
+  MoveStack *curMove, *lastMove, *lastGoodNonCapture, *badCaptures;
+  MoveStack moves[MOVES_MAX];
 };
 
-
-////
-//// Inline functions
-////
-
-/// MovePicker::number_of_evasions() simply returns the number of moves in
-/// evasions phase. It is intended to be used in positions where the side to
-/// move is in check, for detecting checkmates or situations where there is
-/// only a single reply to check.
-/// WARNING: It works as long as PH_EVASIONS is the _only_ phase for evasions.
-
-inline int MovePicker::number_of_evasions() const {
-  return int(lastMove - moves);
-}
-
 #endif // !defined(MOVEPICK_H_INCLUDED)