X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=f989121f378f474551227f7c173d6ec3d3cc9a98;hp=a9a3561acf3fd888f4727f7e34649d47892f8a4b;hb=a4988fecee893fcf6a571abc1d2a102afddce591;hpb=66d5c13a88f041247adf2ba62acdf936a6d6224e

diff --git a/src/movepick.h b/src/movepick.h
index a9a3561a..f989121f 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2009 Marco Costalba
+  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@
 
 #include "depth.h"
 #include "history.h"
-#include "lock.h"
 #include "position.h"
 
 
@@ -50,9 +49,8 @@ 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);
+  MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL, Value beta = -VALUE_INFINITE);
   Move get_next_move();
-  Move get_next_move(Lock& lock);
   int number_of_evasions() const;
 
 private:
@@ -63,11 +61,11 @@ private:
 
   const Position& pos;
   const History& H;
+  Bitboard pinned;
   MoveStack ttMoves[2], killers[2];
-  int phase;
+  int badCaptureThreshold, phase;
   const uint8_t* phasePtr;
-  MoveStack *curMove, *lastMove, *lastBadCapture;
-  Bitboard pinned;
+  MoveStack *curMove, *lastMove, *lastGoodNonCapture, *lastBadCapture;
   MoveStack moves[256], badCaptures[64];
 };