From 7586143d1230f2af5fdffcf22017e049abf4cdb9 Mon Sep 17 00:00:00 2001
From: Ben Frankel <ben.frankel7@gmail.com>
Date: Sun, 28 Jul 2024 22:08:53 -0700
Subject: [PATCH] Fix music syncing on restart from pause menu

---
 src/screen/playing.rs            | 5 ++++-
 src/screen/playing/pause_menu.rs | 9 +--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/screen/playing.rs b/src/screen/playing.rs
index 1f334d6..ac48714 100644
--- a/src/screen/playing.rs
+++ b/src/screen/playing.rs
@@ -16,6 +16,7 @@ use crate::core::pause::Pause;
 use crate::game::actor::player::player;
 use crate::game::audio::music::start_music;
 use crate::game::audio::music::stop_music;
+use crate::game::audio::music::Beat;
 use crate::game::ground::ground;
 use crate::game::spotlight::spotlight_lamp_spawner;
 use crate::game::stats::Stats;
@@ -48,11 +49,13 @@ fn enter_playing(
     game_root: Res<GameRoot>,
     ui_root: Res<UiRoot>,
     mut stats: ResMut<Stats>,
+    mut beat: ResMut<Beat>,
 ) {
     commands.spawn_with(fade_in);
 
-    // Reset stats.
+    // Reset resources.
     *stats = default();
+    *beat = default();
 
     // TODO: Character select screen.
     // Spawn player.
diff --git a/src/screen/playing/pause_menu.rs b/src/screen/playing/pause_menu.rs
index 21fe1f3..90e38d5 100644
--- a/src/screen/playing/pause_menu.rs
+++ b/src/screen/playing/pause_menu.rs
@@ -5,7 +5,6 @@ use pyri_state::extra::entity_scope::StateScope;
 use pyri_state::prelude::*;
 
 use crate::core::pause::Pause;
-use crate::game::audio::music::MusicHandle;
 use crate::screen::fade_out;
 use crate::screen::playing::PlayingAssets;
 use crate::screen::playing::PlayingMenu;
@@ -110,15 +109,9 @@ fn continue_button(mut entity: EntityWorldMut) {
 fn restart_button(mut entity: EntityWorldMut) {
     entity.add(widget::menu_button("Restart")).insert((
         On::<Pointer<Click>>::run(
-            |mut commands: Commands,
-             audio: Res<Audio>,
-             assets: Res<PlayingAssets>,
-             music_handle: Res<MusicHandle>,
-             mut audio_instances: ResMut<Assets<AudioInstance>>| {
+            |mut commands: Commands, audio: Res<Audio>, assets: Res<PlayingAssets>| {
                 commands.spawn_with(fade_out(Screen::Playing));
                 audio.play(assets.sfx_restart.clone()).with_volume(0.7);
-                let music = r!(audio_instances.get_mut(&music_handle.0));
-                music.seek_to(0.0);
             },
         ),
         Style {