Retire enum Direction

[stockfish] / src / square.h

diff --git a/src/square.h b/src/square.h
index 621e398fb19069180f141df29423c4af171de2b6..7a59e078fdc7ec4a02a0a7e2068752778a513668 100644 (file)
--- a/src/square.h
+++ b/src/square.h
@@ -58,33 +58,20 @@ enum Rank {
 
 enum SquareDelta {
 
-  DELTA_N = 8, DELTA_E = 1, DELTA_S = -8, DELTA_W = -1,
+  DELTA_N = 8, DELTA_E = 1, DELTA_S = -8, DELTA_W = -1, DELTA_NONE = 0,
 
   DELTA_NN = DELTA_N + DELTA_N,
   DELTA_NE = DELTA_N + DELTA_E,
   DELTA_SE = DELTA_S + DELTA_E,
   DELTA_SS = DELTA_S + DELTA_S,
   DELTA_SW = DELTA_S + DELTA_W,
-  DELTA_NW = DELTA_N + DELTA_W,
-};
-
-enum Direction {
-  DIR_E = 0, DIR_N = 1, DIR_NE = 2, DIR_NW = 3, DIR_NONE = 4
-};
-
-enum SignedDirection {
-  SIGNED_DIR_E  = 0, SIGNED_DIR_W  = 1,
-  SIGNED_DIR_N  = 2, SIGNED_DIR_S  = 3,
-  SIGNED_DIR_NE = 4, SIGNED_DIR_SW = 5,
-  SIGNED_DIR_NW = 6, SIGNED_DIR_SE = 7,
-  SIGNED_DIR_NONE = 8
+  DELTA_NW = DELTA_N + DELTA_W
 };
 
 ENABLE_OPERATORS_ON(Square);
 ENABLE_OPERATORS_ON(File);
 ENABLE_OPERATORS_ON(Rank);
 ENABLE_OPERATORS_ON(SquareDelta);
-ENABLE_OPERATORS_ON(SignedDirection);
 
 
 ////
@@ -94,8 +81,7 @@ ENABLE_OPERATORS_ON(SignedDirection);
 const int FlipMask = 56;
 const int FlopMask =  7;
 
-extern uint8_t DirectionTable[64][64];
-extern uint8_t SignedDirectionTable[64][64];
+extern int8_t DirectionTable[64][64];
 
 
 ////
@@ -197,16 +183,14 @@ inline bool square_is_ok(Square s) {
   return file_is_ok(square_file(s)) && rank_is_ok(square_rank(s));
 }
 
-inline Direction direction_between_squares(Square s1, Square s2) {
-  return Direction(DirectionTable[s1][s2]);
-}
-
-inline int direction_is_diagonal(Square s1, Square s2) {
-  return DirectionTable[s1][s2] & 2;
+inline bool squares_aligned(Square s1, Square s2, Square s3) {
+  return   DirectionTable[s1][s2] != DELTA_NONE
+        && abs(DirectionTable[s1][s2]) ==  abs(DirectionTable[s2][s3]);
 }
 
 inline bool direction_is_straight(Square s1, Square s2) {
-  return DirectionTable[s1][s2] < 2;
+  return   abs(DirectionTable[s1][s2]) == DELTA_N
+        || abs(DirectionTable[s1][s2]) == DELTA_E;
 }
 
 ////