No need to test for MOVE_NONE before move_is_ok()

[stockfish] / src / types.h

diff --git a/src/types.h b/src/types.h
index d02755c1adcbd46eeb83f8c1bb89f8eb87198a6f..863e0df2f771be35033dd9e22debaa7d524f4203 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -252,6 +252,15 @@ enum ScaleFactor {
   SCALE_FACTOR_NONE   = 255
 };
 
+enum CastleRight {
+  CASTLES_NONE = 0,
+  WHITE_OO     = 1,
+  BLACK_OO     = 2,
+  WHITE_OOO    = 4,
+  BLACK_OOO    = 8,
+  ALL_CASTLES  = 15
+};
+
 
 /// Score enum keeps a midgame and an endgame value in a single
 /// integer (enum), first LSB 16 bits are used to store endgame
@@ -337,6 +346,18 @@ const Value RookValueEndgame   = Value(0x4FE);
 const Value QueenValueMidgame  = Value(0x9D9);
 const Value QueenValueEndgame  = Value(0x9FE);
 
+extern const Value PieceValueMidgame[17];
+extern const Value PieceValueEndgame[17];
+extern int SquareDistance[64][64];
+
+inline Value piece_value_midgame(Piece p) {
+  return PieceValueMidgame[p];
+}
+
+inline Value piece_value_endgame(Piece p) {
+  return PieceValueEndgame[p];
+}
+
 inline Value value_mate_in(int ply) {
   return VALUE_MATE - ply;
 }
@@ -349,11 +370,11 @@ inline Piece make_piece(Color c, PieceType pt) {
   return Piece((c << 3) | pt);
 }
 
-inline PieceType type_of_piece(Piece p)  {
+inline PieceType piece_type(Piece p)  {
   return PieceType(p & 7);
 }
 
-inline Color color_of_piece(Piece p) {
+inline Color piece_color(Piece p) {
   return Color(p >> 3);
 }
 
@@ -420,7 +441,7 @@ inline int rank_distance(Square s1, Square s2) {
 }
 
 inline int square_distance(Square s1, Square s2) {
-  return Max(file_distance(s1, s2), rank_distance(s1, s2));
+  return SquareDistance[s1][s2];
 }
 
 inline char file_to_char(File f) {