From a658673d2b09e11119c52abe2a7cf89473bbdfcc Mon Sep 17 00:00:00 2001
From: Karma Riuk <riukkarma@gmail.com>
Date: Wed, 5 Feb 2025 14:33:59 +0100
Subject: [PATCH] remove castle side from move

---
 cpp/src/board.cpp       | 26 ++++++++++++++------------
 cpp/src/move.hpp        |  2 +-
 cpp/src/pieces/king.cpp |  2 --
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/cpp/src/board.cpp b/cpp/src/board.cpp
index 59e8d52..95848ad 100644
--- a/cpp/src/board.cpp
+++ b/cpp/src/board.cpp
@@ -203,18 +203,20 @@ Board Board::make_move(Move move) const {
 
     // -- Handle castling (just move the rook over)
     Coords c = Coords::from_index(move.source_square);
-    if (move.castle_side & KingSide) {
-        Coords rook_source{7, c.y};
-        int8_t old_rook = ret.squares[rook_source.to_index()];
-        ret.squares[rook_source.to_index()] = Piece::None;
-        Coords rook_dest{5, c.y};
-        ret.squares[rook_dest.to_index()] = old_rook;
-    } else if (move.castle_side & QueenSide) {
-        Coords rook_source{0, c.y};
-        int8_t old_rook = ret.squares[rook_source.to_index()];
-        ret.squares[rook_source.to_index()] = Piece::None;
-        Coords rook_dest{3, c.y};
-        ret.squares[rook_dest.to_index()] = old_rook;
+    if ((squares[move.source_square] & 0b111) == Piece::King) {
+        if (move.target_square - move.source_square == 2) { // king side castle
+            Coords rook_source{7, c.y};
+            int8_t old_rook = ret.squares[rook_source.to_index()];
+            ret.squares[rook_source.to_index()] = Piece::None;
+            Coords rook_dest{5, c.y};
+            ret.squares[rook_dest.to_index()] = old_rook;
+        } else if (move.target_square - move.source_square == -2) { // queen
+            Coords rook_source{0, c.y};
+            int8_t old_rook = ret.squares[rook_source.to_index()];
+            ret.squares[rook_source.to_index()] = Piece::None;
+            Coords rook_dest{3, c.y};
+            ret.squares[rook_dest.to_index()] = old_rook;
+        }
     }
 
     // -- Check for castling rights
diff --git a/cpp/src/move.hpp b/cpp/src/move.hpp
index 129c53d..8b1cd72 100644
--- a/cpp/src/move.hpp
+++ b/cpp/src/move.hpp
@@ -12,7 +12,7 @@ struct Move {
     int8_t target_square;
 
     // bool is_capturing = false;
-    CastleSide castle_side = CastleSide::NeitherSide;
+    // CastleSide castle_side = CastleSide::NeitherSide;
     bool en_passant = false;
     int8_t promoting_to = Piece::None;
 
diff --git a/cpp/src/pieces/king.cpp b/cpp/src/pieces/king.cpp
index 7f1734d..5dd0024 100644
--- a/cpp/src/pieces/king.cpp
+++ b/cpp/src/pieces/king.cpp
@@ -60,7 +60,6 @@ std::vector<Move> king_moves(const Board& b, const Coords xy) {
         ret.push_back(Move{
             xy.to_index(),
             Coords{6, xy.y}.to_index(),
-            .castle_side = CastleSide::KingSide
         });
     }
 
@@ -68,7 +67,6 @@ std::vector<Move> king_moves(const Board& b, const Coords xy) {
         ret.push_back(Move{
             xy.to_index(),
             Coords{2, xy.y}.to_index(),
-            .castle_side = CastleSide::QueenSide
         });
     }