Rename MOVES_MAX in MAX_MOVES

[stockfish] / src / move.h

diff --git a/src/move.h b/src/move.h
index db2529c3df6effc009688ef2f57fb94c3a105a8a..299379e2003b57f8375435e90e7fbf7059148ff5 100644 (file)
--- a/src/move.h
+++ b/src/move.h
@@ -17,28 +17,16 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(MOVE_H_INCLUDED)
 #define MOVE_H_INCLUDED
 
-////
-//// Includes
-////
-
-#include <iostream>
+#include <string>
 
 #include "misc.h"
-#include "piece.h"
-#include "square.h"
+#include "types.h"
 
 // Maximum number of allowed moves per position
-const int MOVES_MAX = 256;
-
-////
-//// Types
-////
-
-class Position;
+const int MAX_MOVES = 256;
 
 /// A move needs 16 bits to be stored
 ///
@@ -140,9 +128,6 @@ inline T pick_best(T* curMove, T* lastMove)
     return bestMove;
 }
 
-////
-//// Inline functions
-////
 
 inline Square move_from(Move m) {
   return Square((int(m) >> 6) & 0x3F);
@@ -196,14 +181,15 @@ inline Move make_castle_move(Square from, Square to) {
   return Move(int(to) | (int(from) << 6) | (3 << 14));
 }
 
+inline bool move_is_ok(Move m) {
+  return move_from(m) != move_to(m); // Catches also MOVE_NONE
+}
 
-////
-//// Prototypes
-////
+class Position;
 
-extern std::ostream& operator<<(std::ostream& os, Move m);
-extern Move move_from_uci(const Position& pos, const std::string &str);
 extern const std::string move_to_uci(Move m, bool chess960);
-extern bool move_is_ok(Move m);
+extern Move move_from_uci(const Position& pos, const std::string& str);
+extern const std::string move_to_san(Position& pos, Move m);
+extern const std::string pretty_pv(Position& pos, int depth, Value score, int time, Move pv[]);
 
 #endif // !defined(MOVE_H_INCLUDED)