Skip to content

Commit

Permalink
Merge pull request #224 from TruncateGame/main
Browse files Browse the repository at this point in the history
Third production deploy's a charm
  • Loading branch information
bglw authored Mar 24, 2024
2 parents 7994435 + 3ae0931 commit bc76c54
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 1 addition & 2 deletions truncate_client/src/app_inner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,10 @@ pub fn handle_server_msg(outer: &mut OuterApplication, ui: &mut egui::Ui, curren
.unwrap();

// If we're joining a lobby, update the URL to match
_ = web_sys::window().unwrap().location().set_pathname("/join/");
_ = web_sys::window()
.unwrap()
.location()
.set_search(&format!("j={}", id.to_uppercase()));
.set_hash(id.to_uppercase().as_str());
}

outer.game_status = GameStatus::PendingStart(Lobby::new(
Expand Down
3 changes: 3 additions & 0 deletions truncate_server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,9 @@ async fn handle_player_msg(
}
}
LoadReplay(id) => {
let connection_player = connection_info_mutex.lock().player.clone();
_ = create_event(&server_state, &"load_replay".into(), connection_player).await;

let Ok(uuid) = Uuid::parse_str(&id) else {
return player_err("Invalid Replay ID".into());
};
Expand Down

0 comments on commit bc76c54

Please sign in to comment.