Prefer int to uint8_t when possible

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index b42f839bc8bc571fcf3dc4a3e544b6dad4400076..c656deaf44bc319ac06fd37bdc679d894ab03422 100644 (file)
--- 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,12 +61,12 @@ private:
 
   const Position& pos;
   const History& H;
-  MoveStack ttMoves[2], killers[2];
-  int phase;
-  const uint8_t* phasePtr;
-  MoveStack *curMove, *lastMove, *lastBadCapture;
   Bitboard pinned;
-  MoveStack moves[256], badCaptures[64];
+  MoveStack ttMoves[2], killers[2];
+  int badCaptureThreshold, phase;
+  const int* phasePtr;
+  MoveStack *curMove, *lastMove, *lastGoodNonCapture, *badCaptures;
+  MoveStack moves[MOVES_MAX];
 };