From 731e9a955dbdf10f7e8860936dd71977ce8f8bf3 Mon Sep 17 00:00:00 2001
From: Martin Indra <martin.indra@mgn.cz>
Date: Sat, 22 Jul 2023 18:28:05 +0200
Subject: [PATCH] WIP

---
 crates/audio/src/music.rs     | 16 +++++++++-------
 crates/camera/src/distance.rs |  2 +-
 crates/menu/src/lib.rs        |  3 ++-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/crates/audio/src/music.rs b/crates/audio/src/music.rs
index d845a806c..9fb02ad98 100644
--- a/crates/audio/src/music.rs
+++ b/crates/audio/src/music.rs
@@ -1,4 +1,4 @@
-use bevy::{asset::LoadState, prelude::*};
+use bevy::{asset::LoadState, audio::Volume, prelude::*};
 use de_conf::Configuration;
 use de_core::state::AppState;
 use iyes_progress::prelude::*;
@@ -12,7 +12,7 @@ impl Plugin for MusicPlugin {
                 Update,
                 load.track_progress().run_if(in_state(AppState::AppLoading)),
             )
-            .add_systems(Update, start.in_schedule(OnExit(AppState::AppLoading)));
+            .add_systems(OnExit(AppState::AppLoading), start);
     }
 }
 
@@ -31,12 +31,14 @@ fn load(server: Res<AssetServer>, tracks: Res<Tracks>) -> Progress {
     }
 }
 
-fn start(audio: Res<Audio>, tracks: Res<Tracks>, config: Res<Configuration>) {
+fn start(mut commands: Commands, tracks: Res<Tracks>, config: Res<Configuration>) {
     if !config.audio().music_enabled() {
         return;
     }
-    audio.play_with_settings(
-        tracks.0.clone(),
-        PlaybackSettings::LOOP.with_volume(config.audio().music_volume()),
-    );
+
+    let volume = Volume::new_relative(config.audio().music_volume());
+    commands.spawn(AudioBundle {
+        source: tracks.0.clone(),
+        settings: PlaybackSettings::LOOP.with_volume(volume),
+    });
 }
diff --git a/crates/camera/src/distance.rs b/crates/camera/src/distance.rs
index 4559f78fd..73d9ae7ca 100644
--- a/crates/camera/src/distance.rs
+++ b/crates/camera/src/distance.rs
@@ -9,7 +9,7 @@ pub(crate) struct DistancePlugin;
 impl Plugin for DistancePlugin {
     fn build(&self, app: &mut App) {
         app.add_systems(
-            PostUPdate,
+            PostUpdate,
             (
                 init::<MovableSolid>.run_if(in_state(AppState::InGame)),
                 init::<StaticSolid>.run_if(in_state(AppState::InGame)),
diff --git a/crates/menu/src/lib.rs b/crates/menu/src/lib.rs
index 72e484921..4653c91a0 100644
--- a/crates/menu/src/lib.rs
+++ b/crates/menu/src/lib.rs
@@ -3,6 +3,7 @@ use bevy::{app::PluginGroupBuilder, prelude::*};
 use create::CreateGamePlugin;
 use de_core::{
     gresult::GameResult,
+    nested_state,
     state::AppState,
     transition::{DeStateTransition, StateWithSet},
 };
@@ -28,7 +29,7 @@ pub struct MenuPluginGroup;
 impl PluginGroup for MenuPluginGroup {
     fn build(self) -> PluginGroupBuilder {
         PluginGroupBuilder::start::<Self>()
-            .add(MenuSetupPlugin)
+            .add(MenuStatePlugin)
             .add(MenuPlugin)
             .add(MainMenuPlugin)
             .add(MapSelectionPlugin)