en passant fixed

JakubBraz · Sep 18, 2024 · 83762ad · 83762ad
1 parent d0e24f2
commit 83762ad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/game_logic/src/board.rs b/game_logic/src/board.rs
@@ -85,7 +85,9 @@ impl Board {
                 self.squares[move_to.0][move_to.1] = Some(Piece { color: Black, kind: PieceType::Queen });
             }
             else if move_from.1 + 1 == move_to.1 || move_to.1 + 1 == move_from.1 {
-                self.squares[move_from.0][move_to.1] = None;
+                if self.squares[move_from.0][move_to.1].is_some_and(|x| x.kind == PieceType::Pawn && x.color != piece.color) {
+                    self.squares[move_from.0][move_to.1] = None;
+                }
             }
         }
     }

diff --git a/game_logic/src/game_server.rs b/game_logic/src/game_server.rs
@@ -113,8 +113,8 @@ pub fn handle_game(receiver: Receiver<ChannelMsg>) {
                                         White
                                     }
                                 };
-                                board.color_to_play() == player_color && allowed_moves(board, move_from.0, move_from.1, player_color).contains(&move_to)
-                                // allowed_moves(board, move_from.0, move_from.1, player_color).contains(&move_to)
+                                // board.color_to_play() == player_color && allowed_moves(board, move_from.0, move_from.1, player_color).contains(&move_to)
+                                allowed_moves(board, move_from.0, move_from.1, player_color).contains(&move_to)
                             }
                             _ => false
                         };