From 39d197b45dbf94216398c0d205b54cd2650ce404 Mon Sep 17 00:00:00 2001 From: Jonni Liljamo Date: Tue, 17 Jan 2023 09:41:06 +0200 Subject: [PATCH] feat(sdbclient): add states related to lobbies --- sdbclient/src/plugins/menu/mod.rs | 7 +++++++ sdbclient/src/plugins/menu/playscreen.rs | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sdbclient/src/plugins/menu/mod.rs b/sdbclient/src/plugins/menu/mod.rs index 13884e4..81340eb 100644 --- a/sdbclient/src/plugins/menu/mod.rs +++ b/sdbclient/src/plugins/menu/mod.rs @@ -87,6 +87,9 @@ pub enum MenuState { None, Main, Play, + Lobby, + CreateGame, + JoinGame, Settings, SettingsDisplay, SettingsAudio, @@ -114,6 +117,8 @@ struct SelectedSettingsTab; #[derive(Component)] enum MenuButtonAction { Play, + CreateGame, + JoinGame, Settings, SettingsDisplay, SettingsAudio, @@ -145,6 +150,8 @@ fn menu_action( match menu_button_action { MenuButtonAction::Exit => app_exit_events.send(AppExit), MenuButtonAction::Play => menu_state.set(MenuState::Play).unwrap(), + MenuButtonAction::CreateGame => menu_state.set(MenuState::CreateGame).unwrap(), + MenuButtonAction::JoinGame => menu_state.set(MenuState::JoinGame).unwrap(), MenuButtonAction::Settings => menu_state.set(MenuState::Settings).unwrap(), MenuButtonAction::SettingsDisplay => { menu_state.set(MenuState::SettingsDisplay).unwrap() diff --git a/sdbclient/src/plugins/menu/playscreen.rs b/sdbclient/src/plugins/menu/playscreen.rs index 8150421..695344a 100644 --- a/sdbclient/src/plugins/menu/playscreen.rs +++ b/sdbclient/src/plugins/menu/playscreen.rs @@ -76,7 +76,11 @@ pub fn play_setup(mut commands: Commands, asset_server: Res) { ..default() }) .with_children(|parent| { - for (action, text) in [(MenuButtonAction::BackToMainMenu, "Back")] { + for (action, text) in [ + (MenuButtonAction::CreateGame, "Create"), + (MenuButtonAction::JoinGame, "Join"), + (MenuButtonAction::BackToMainMenu, "Back"), + ] { parent .spawn(( ButtonBundle { -- 2.44.1