refactor: improve castling clear

Disservin · Oct 19, 2024 · 4a4766f · 4a4766f
1 parent 87e2158
commit 4a4766f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/include/chess.hpp b/include/chess.hpp
@@ -1755,16 +1755,7 @@ class Board {
 
         int clear(Color color, Side castle) {
             rooks[color][static_cast<int>(castle)] = File::NO_FILE;
-
-            switch (castle) {
-                case Side::KING_SIDE:
-                    return color == Color::WHITE ? 0 : 2;
-                case Side::QUEEN_SIDE:
-                    return color == Color::WHITE ? 1 : 3;
-                default:
-                    assert(false);
-                    return -1;
-            }
+            return color * 2 + static_cast<int>(castle);
         }
 
         void clear(Color color) { rooks[color].fill(File::NO_FILE); }

diff --git a/src/board.hpp b/src/board.hpp
@@ -55,16 +55,7 @@ class Board {
 
         int clear(Color color, Side castle) {
             rooks[color][static_cast<int>(castle)] = File::NO_FILE;
-
-            switch (castle) {
-                case Side::KING_SIDE:
-                    return color == Color::WHITE ? 0 : 2;
-                case Side::QUEEN_SIDE:
-                    return color == Color::WHITE ? 1 : 3;
-                default:
-                    assert(false);
-                    return -1;
-            }
+            return color * 2 + static_cast<int>(castle);
         }
 
         void clear(Color color) { rooks[color].fill(File::NO_FILE); }