From e994682af51367b91d48a806397510ecfb5159f7 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Thu, 2 Mar 2023 08:29:49 +0100 Subject: [PATCH] Fixed featureless compilation --- src/main.rs | 2 +- src/screens/welcome.rs | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index b0446f3..d6d7c72 100644 --- a/src/main.rs +++ b/src/main.rs @@ -35,7 +35,7 @@ async fn main() { let mut screen = Screen::default(); let mut ctx = AudioContext::new(); - let mut sound = Sound::load(&mut ctx, include_bytes!("../assets/music.wav")); + let sound = Sound::load(&mut ctx, include_bytes!("../assets/music.wav")); sound.play(&mut ctx, PlaySoundParams{ looped: true, volume: 0.2 diff --git a/src/screens/welcome.rs b/src/screens/welcome.rs index e227fde..6cc8a69 100644 --- a/src/screens/welcome.rs +++ b/src/screens/welcome.rs @@ -11,6 +11,7 @@ use crate::ui::{ ButtonEvent }; use super::map_select::SelectScreen; +#[cfg(feature = "multiplayer")] use super::build::BuildScreen; use super::Screen; @@ -22,6 +23,7 @@ pub struct WelcomeScreen { /// level select button widget widget_select: TextButton, /// join-host button widget + #[cfg(feature = "multiplayer")] widget_join: TextButton, /// game quit button widget widget_quit: TextButton, @@ -34,6 +36,7 @@ impl WelcomeScreen { .with_font_size(100), widget_select: TextButton::new("Maps", 0.35, 0.55) .with_font_size(40), + #[cfg(feature = "multiplayer")] widget_join: TextButton::new("Join", 0.5, 0.55) .with_font_size(40), widget_quit: TextButton::new("Quit", 0.65, 0.55) @@ -66,6 +69,7 @@ impl GameComponent for WelcomeScreen { self.widget_title.draw(&assets).await; self.widget_select.draw(&assets).await; + #[cfg(feature = "multiplayer")] self.widget_join.draw(&assets).await; self.widget_quit.draw(&assets).await; } @@ -76,6 +80,7 @@ impl GameComponent for WelcomeScreen { ButtonEvent::LeftClick => return GameEvent::ChangeScreen(Screen::Select(SelectScreen::new())), _ => () } + #[cfg(feature = "multiplayer")] match self.widget_join.ev_loop() { ButtonEvent::LeftClick => return GameEvent::ChangeScreen(Screen::Build(BuildScreen::join())), _ => () -- 2.38.5