From 417825d0387c5f459edc719bbdb7cf02f4f406c1 Mon Sep 17 00:00:00 2001 From: CoCo_Sol007 Date: Thu, 21 Mar 2024 22:18:24 +0100 Subject: [PATCH] update --- crates/border-wars/src/networking/connection.rs | 1 + crates/border-wars/src/scenes/lobby.rs | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/crates/border-wars/src/networking/connection.rs b/crates/border-wars/src/networking/connection.rs index 11180f6..3850d62 100644 --- a/crates/border-wars/src/networking/connection.rs +++ b/crates/border-wars/src/networking/connection.rs @@ -84,6 +84,7 @@ pub fn handle_change_player( }; for add_player in add_players.read() { + println!("{:?}", add_player.1.1); all_players.0.insert(add_player.1.0, add_player.1.1.clone()); } diff --git a/crates/border-wars/src/scenes/lobby.rs b/crates/border-wars/src/scenes/lobby.rs index 88ca4f2..840ac6e 100644 --- a/crates/border-wars/src/scenes/lobby.rs +++ b/crates/border-wars/src/scenes/lobby.rs @@ -42,13 +42,14 @@ fn lobby_ui( ui.separator(); - for (uuid, player) in all_players.0.iter() { - ui.label(format!("{}: {:?}", player.name, player.rank)); + for (connected_player_id, connected_player) in all_players.0.iter() { + ui.label(connected_player.name.to_string()); if all_players.get_by_connection(&connection).map(|p| p.rank) == Some(GameRank::Admin) + && connected_player.rank != GameRank::Admin && ui.button("Remove").clicked() { for sender_id in all_players.0.keys() { - kick_player.send(SendTo(*sender_id, RemovePlayer(*uuid))); + kick_player.send(SendTo(*sender_id, RemovePlayer(*connected_player_id))); } } ui.separator();