stephenseo/EN605.607.81.SP22_ASDM_Project
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix bug: board not updated on win/lose/draw

Browse source
This commit is contained in:
Stephen Seo 2022-05-04 14:55:01 +09:00
parent b5529cb542
commit 1872c4877e
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
back_end/src/db_handler.rs
View file

@ -928,7 +928,7 @@ impl DBHandler {
} }
// get board state // get board state
let board = board_from_string(board_string); let board = board_from_string(&board_string);
// find placement position or return "illegal move" if unable to // find placement position or return "illegal move" if unable to
let mut final_pos = pos; let mut final_pos = pos;
@ -1064,7 +1064,7 @@ impl DBHandler {
}; };
let is_cyan = status == 0; let is_cyan = status == 0;
let board = board_from_string(board_string); let board = board_from_string(&board_string);
let mut ai_choice_pos: usize = get_ai_choice( let mut ai_choice_pos: usize = get_ai_choice(
AIDifficulty::Hard, AIDifficulty::Hard,
if is_cyan { if is_cyan {

2
front_end/src/state.rs
View file

@ -454,7 +454,7 @@ pub fn new_string_board() -> String {
} }
#[allow(dead_code)] #[allow(dead_code)]
pub fn board_from_string(board_string: String) -> BoardType { pub fn board_from_string(board_string: &str) -> BoardType {
let board = new_empty_board(); let board = new_empty_board();
for (idx, c) in board_string.chars().enumerate() { for (idx, c) in board_string.chars().enumerate() {

17
front_end/src/yew_components.rs
View file

@ -615,9 +615,9 @@ impl Wrapper {
&mut self, &mut self,
shared: &SharedState, shared: &SharedState,
document: &Document, document: &Document,
board_string: String, board_string: &str,
) { ) {
let board = board_from_string(board_string.clone()); let board = board_from_string(board_string);
for (idx, slot) in board.iter().enumerate() { for (idx, slot) in board.iter().enumerate() {
let was_open = let was_open =
element_has_class(document, &format!("slot{}", idx), "open").unwrap_or(false); element_has_class(document, &format!("slot{}", idx), "open").unwrap_or(false);
@ -1579,7 +1579,7 @@ impl Component for Wrapper {
if self.board_updated_time != updated_time { if self.board_updated_time != updated_time {
if let Some(updated_time) = updated_time { if let Some(updated_time) = updated_time {
self.board_updated_time.replace(updated_time); self.board_updated_time.replace(updated_time);
if let Some(board_string) = board_string { if let Some(board_string) = board_string.as_ref() {
self.update_board_from_string(&shared, &document, board_string); self.update_board_from_string(&shared, &document, board_string);
} }
} }
@ -1635,6 +1635,9 @@ impl Component for Wrapper {
} }
} }
NetworkedGameState::CyanWon => { NetworkedGameState::CyanWon => {
if let Some(board_string) = board_string.as_ref() {
self.update_board_from_string(&shared, &document, board_string);
}
append_to_info_text( append_to_info_text(
&document, &document,
"info_text1", "info_text1",
@ -1648,6 +1651,9 @@ impl Component for Wrapper {
self.do_backend_tick = false; self.do_backend_tick = false;
} }
NetworkedGameState::MagentaWon => { NetworkedGameState::MagentaWon => {
if let Some(board_string) = board_string.as_ref() {
self.update_board_from_string(&shared, &document, board_string);
}
append_to_info_text( append_to_info_text(
&document, &document,
"info_text1", "info_text1",
@ -1661,6 +1667,9 @@ impl Component for Wrapper {
self.do_backend_tick = false; self.do_backend_tick = false;
} }
NetworkedGameState::Draw => { NetworkedGameState::Draw => {
if let Some(board_string) = board_string.as_ref() {
self.update_board_from_string(&shared, &document, board_string);
}
append_to_info_text( append_to_info_text(
&document, &document,
"info_text1", "info_text1",
@ -1723,7 +1732,7 @@ impl Component for Wrapper {
} }
} }
BREnum::GotPlaced(placed_status, board_string) => { BREnum::GotPlaced(placed_status, board_string) => {
self.update_board_from_string(&shared, &document, board_string); self.update_board_from_string(&shared, &document, &board_string);
match placed_status { match placed_status {
PlacedEnum::Accepted => { PlacedEnum::Accepted => {