FIX: Stopping player before starting scene transitions

afska · Jan 16, 2024 · db947c5 · db947c5
1 parent f442a25
commit db947c5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 1 deletion.
diff --git a/src/scenes/AdminScene.cpp b/src/scenes/AdminScene.cpp
@@ -204,6 +204,7 @@ bool AdminScene::selectOption(u32 selected, int direction) {
       u8 value = SAVEFILE_read8(SRAM->adminSettings.navigationStyle);
       SAVEFILE_write8(SRAM->adminSettings.navigationStyle,
                       change(value, 2, direction));
+      player_stop();
       engine->transitionIntoScene(new AdminScene(engine, fs, true),
                                   new PixelTransitionEffect());
       return false;

diff --git a/src/scenes/CalibrateScene.cpp b/src/scenes/CalibrateScene.cpp
@@ -217,7 +217,9 @@ void CalibrateScene::save() {
 void CalibrateScene::goBack() {
   if (onFinish != NULL)
     onFinish();
-  else
+  else {
+    player_stop();
     engine->transitionIntoScene(new SettingsScene(engine, fs),
                                 new PixelTransitionEffect());
+  }
 }
diff --git a/src/scenes/DeathMixScene.cpp b/src/scenes/DeathMixScene.cpp
@@ -186,6 +186,7 @@ void DeathMixScene::confirm(u16 keys) {
     SAVEFILE_write8(SRAM->state.isPlaying, true);
     STATE_setup(songChart.song, songChart.chart);
     deathMix->multiplier = GameState.mods.multiplier;
+    player_stop();
     engine->transitionIntoScene(
         new SongScene(engine, fs, songChart.song, songChart.chart, NULL,
                       std::move(deathMix)),

diff --git a/src/scenes/MultiplayerLobbyScene.cpp b/src/scenes/MultiplayerLobbyScene.cpp
@@ -79,11 +79,13 @@ void MultiplayerLobbyScene::refresh(int newMessageId) {
 }
 
 void MultiplayerLobbyScene::start() {
+  player_stop();
   engine->transitionIntoScene(new SelectionScene(engine, fs),
                               new PixelTransitionEffect());
 }
 
 void MultiplayerLobbyScene::goBack() {
+  player_stop();
   engine->transitionIntoScene(new StartScene(engine, fs),
                               new PixelTransitionEffect());
   syncer->initialize(SyncMode::SYNC_MODE_OFFLINE);

diff --git a/src/scenes/SelectionScene.cpp b/src/scenes/SelectionScene.cpp
@@ -558,13 +558,15 @@ bool SelectionScene::onNumericLevelChange(ArrowDirection selector,
       if (selector == ArrowDirection::UPRIGHT && !isDouble) {
         SAVEFILE_write8(SRAM->adminSettings.arcadeCharts,
                         ArcadeChartsOpts::DOUBLE);
+        player_stop();
         engine->transitionIntoScene(
             new SelectionScene(engine, fs, InitialLevel::FIRST_LEVEL),
             new PixelTransitionEffect());
         return true;
       } else if (selector == ArrowDirection::UPLEFT && isDouble) {
         SAVEFILE_write8(SRAM->adminSettings.arcadeCharts,
                         ArcadeChartsOpts::SINGLE);
+        player_stop();
         engine->transitionIntoScene(
             new SelectionScene(engine, fs, InitialLevel::LAST_LEVEL),
             new PixelTransitionEffect());

diff --git a/src/scenes/SettingsScene.cpp b/src/scenes/SettingsScene.cpp
@@ -79,6 +79,7 @@ bool SettingsScene::selectOption(u32 selected, int direction) {
       if (direction != 0)
         return true;
 
+      player_stop();
       engine->transitionIntoScene(new CalibrateScene(engine, fs),
                                   new PixelTransitionEffect());
       return false;
@@ -122,6 +123,7 @@ bool SettingsScene::selectOption(u32 selected, int direction) {
       if (direction != 0)
         return true;
 
+      player_stop();
       engine->transitionIntoScene(new StartScene(engine, fs),
                                   new PixelTransitionEffect());
       return false;