From fc44f230929fca72c93bbe5f8565c225b6b14e0b Mon Sep 17 00:00:00 2001 From: Sofia Date: Wed, 22 Jul 2026 20:30:32 +0300 Subject: [PATCH] Rename player_listing to lobby_player_listing --- godot/scenes/lobby.tscn | 2 +- .../ui/{player_listing.tscn => lobby_player_listing.tscn} | 4 ++-- rust/src/ui/lobby.rs | 6 +++--- rust/src/ui/{player_listing.rs => lobby_player_listing.rs} | 6 +++--- rust/src/ui/mod.rs | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) rename godot/scenes/ui/{player_listing.tscn => lobby_player_listing.tscn} (82%) rename rust/src/ui/{player_listing.rs => lobby_player_listing.rs} (97%) diff --git a/godot/scenes/lobby.tscn b/godot/scenes/lobby.tscn index e41e548..e2614f5 100644 --- a/godot/scenes/lobby.tscn +++ b/godot/scenes/lobby.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://bwd6bj21x310s"] -[ext_resource type="PackedScene" uid="uid://ccd0wj2usx5os" path="res://scenes/ui/player_listing.tscn" id="1_o1atq"] +[ext_resource type="PackedScene" uid="uid://ccd0wj2usx5os" path="res://scenes/ui/lobby_player_listing.tscn" id="1_o1atq"] [sub_resource type="LabelSettings" id="LabelSettings_1cgct"] font_size = 32 diff --git a/godot/scenes/ui/player_listing.tscn b/godot/scenes/ui/lobby_player_listing.tscn similarity index 82% rename from godot/scenes/ui/player_listing.tscn rename to godot/scenes/ui/lobby_player_listing.tscn index d3f9b7a..c02dcd4 100644 --- a/godot/scenes/ui/player_listing.tscn +++ b/godot/scenes/ui/lobby_player_listing.tscn @@ -1,11 +1,11 @@ [gd_scene format=3 uid="uid://ccd0wj2usx5os"] -[node name="player_listing" type="PlayerListing" unique_id=772938280 node_paths=PackedStringArray("name_label", "ping_label", "ready_label", "team_dropdown")] +[node name="lobby_player_listing" type="LobbyPlayerListing" unique_id=887620055 node_paths=PackedStringArray("name_label", "ping_label", "ready_label", "team_dropdown")] name_label = NodePath("name") ping_label = NodePath("ping") ready_label = NodePath("ready") team_dropdown = NodePath("option_button") -offset_right = 319.0 +offset_right = 673.0 offset_bottom = 23.0 columns = 4 diff --git a/rust/src/ui/lobby.rs b/rust/src/ui/lobby.rs index 8afc23a..d1288ea 100644 --- a/rust/src/ui/lobby.rs +++ b/rust/src/ui/lobby.rs @@ -11,7 +11,7 @@ use godot::{ use crate::{ game_manager::{Game, GameManager, GameOption, GameOptionValue, GameOptions}, net::network_manager::{NetworkManager, Package, PeerKind}, - ui::player_listing::PlayerListing, + ui::lobby_player_listing::LobbyPlayerListing, }; #[derive(GodotClass)] @@ -239,7 +239,7 @@ impl LobbyPanel { if let Some(prefab) = &self.player_listing_prefab { for player in &game.bind().players { if let Some(node) = prefab.instantiate() { - let mut listing = node.cast::(); + let mut listing = node.cast::(); listing.bind_mut().player_id = Some(player.id()); listing.bind_mut().update_teams(game.bind().get_teams()); listing.bind_mut().update(); @@ -250,7 +250,7 @@ impl LobbyPanel { } } else { for child in list.get_children().iter_shared() { - let mut listing = child.cast::(); + let mut listing = child.cast::(); if let Some(game) = Game::singleton() { listing.bind_mut().update_teams(game.bind().get_teams()); } diff --git a/rust/src/ui/player_listing.rs b/rust/src/ui/lobby_player_listing.rs similarity index 97% rename from rust/src/ui/player_listing.rs rename to rust/src/ui/lobby_player_listing.rs index 7e1dbfd..262592e 100644 --- a/rust/src/ui/player_listing.rs +++ b/rust/src/ui/lobby_player_listing.rs @@ -11,7 +11,7 @@ use crate::{ #[derive(GodotClass)] #[class(base=GridContainer, init)] -pub struct PlayerListing { +pub struct LobbyPlayerListing { #[export] pub name_label: Option>, #[export] @@ -27,7 +27,7 @@ pub struct PlayerListing { } #[godot_api] -impl IGridContainer for PlayerListing { +impl IGridContainer for LobbyPlayerListing { fn ready(&mut self) { self.run_deferred(|s| { if let Some(game) = &mut Game::singleton() { @@ -65,7 +65,7 @@ impl IGridContainer for PlayerListing { } } -impl PlayerListing { +impl LobbyPlayerListing { pub fn update_game_options(&mut self, opts: &GameOptions, self_id: Option) { let is_host = NetworkManager::singleton().bind().is_host(); diff --git a/rust/src/ui/mod.rs b/rust/src/ui/mod.rs index 8b00937..659fc53 100644 --- a/rust/src/ui/mod.rs +++ b/rust/src/ui/mod.rs @@ -1,5 +1,5 @@ pub mod cli; pub mod lobby; +pub mod lobby_player_listing; pub mod net_stats; -pub mod player_listing; pub mod simple_score_view;