X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsquare.h;h=f89c72eefe6b770075594b7092ca1b42d1ce9185;hp=621e398fb19069180f141df29423c4af171de2b6;hb=dadf6a6fe9874fa2efb91f14b5b6456fdd8483b2;hpb=6080fecf9cba9ac063f8f07bd25004c14016bd33 diff --git a/src/square.h b/src/square.h index 621e398f..f89c72ee 100644 --- 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, + 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 -}; - -ENABLE_OPERATORS_ON(Square); -ENABLE_OPERATORS_ON(File); -ENABLE_OPERATORS_ON(Rank); -ENABLE_OPERATORS_ON(SquareDelta); -ENABLE_OPERATORS_ON(SignedDirection); +ENABLE_OPERATORS_ON(Square) +ENABLE_OPERATORS_ON(File) +ENABLE_OPERATORS_ON(Rank) +ENABLE_OPERATORS_ON(SquareDelta) //// @@ -94,10 +81,6 @@ ENABLE_OPERATORS_ON(SignedDirection); const int FlipMask = 56; const int FlopMask = 7; -extern uint8_t DirectionTable[64][64]; -extern uint8_t SignedDirectionTable[64][64]; - - //// //// Inline functions //// @@ -197,22 +180,4 @@ 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 direction_is_straight(Square s1, Square s2) { - return DirectionTable[s1][s2] < 2; -} - -//// -//// Prototypes -//// - -extern void init_direction_table(); - #endif // !defined(SQUARE_H_INCLUDED)