X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsquare.h;h=e4eab2ac2bad85b6d54717bb41cbc6cf9e86c16e;hp=66b714a13de3589cb4f0686ab47bfd24d4d53bf4;hb=d6904157aab50f7b2a53843f681b232247e866e2;hpb=9fc602bae74b8e09bd45ace3b42a8ce84d56b23c diff --git a/src/square.h b/src/square.h index 66b714a1..e4eab2ac 100644 --- a/src/square.h +++ b/src/square.h @@ -135,8 +135,13 @@ inline Rank relative_rank(Color c, Square s) { return square_rank(relative_square(c, s)); } -inline Color square_color(Square s) { - return Color((int(square_file(s)) + int(square_rank(s))) & 1); +inline SquareColor square_color(Square s) { + return SquareColor((int(square_file(s)) + int(square_rank(s))) & 1); +} + +inline bool same_color_squares(Square s1, Square s2) { + int s = int(s1) ^ int(s2); + return (((s >> 3) ^ s) & 1) == 0; } inline int file_distance(File f1, File f2) { @@ -180,10 +185,8 @@ inline Square square_from_string(const std::string& str) { } inline const std::string square_to_string(Square s) { - std::string str; - str += file_to_char(square_file(s)); - str += rank_to_char(square_rank(s)); - return str; + return std::string(1, file_to_char(square_file(s))) + + std::string(1, rank_to_char(square_rank(s))); } inline bool file_is_ok(File f) {