From 68ea350bf44f475479c7d633af5d5851f6d9e88c Mon Sep 17 00:00:00 2001 From: Agetian Date: Wed, 7 Jun 2023 08:28:41 +0300 Subject: [PATCH] - Add music back to town events/draft scene. --- forge-gui-mobile/src/forge/adventure/scene/DraftScene.java | 4 +++- forge-gui-mobile/src/forge/adventure/scene/EventScene.java | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/forge-gui-mobile/src/forge/adventure/scene/DraftScene.java b/forge-gui-mobile/src/forge/adventure/scene/DraftScene.java index 1e03f58b973..d3caa502bb0 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/DraftScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/DraftScene.java @@ -3,6 +3,7 @@ package forge.adventure.scene; import forge.adventure.data.AdventureEventData; import forge.adventure.stage.GameHUD; import forge.screens.FScreen; +import forge.sound.MusicPlaylist; import forge.sound.SoundSystem; /** @@ -32,7 +33,8 @@ public class DraftScene extends ForgeScene { @Override public void enter() { GameHUD.getInstance().getTouchpad().setVisible(false); - SoundSystem.instance.pause(); + GameHUD.getInstance().pauseMusic(); + SoundSystem.instance.setBackgroundMusic(MusicPlaylist.MENUS); screen = null; getScreen(); screen.refresh(); diff --git a/forge-gui-mobile/src/forge/adventure/scene/EventScene.java b/forge-gui-mobile/src/forge/adventure/scene/EventScene.java index f30dfc4e826..e0a72afba68 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/EventScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/EventScene.java @@ -13,12 +13,14 @@ import forge.Forge; import forge.adventure.character.EnemySprite; import forge.adventure.data.*; import forge.adventure.player.AdventurePlayer; +import forge.adventure.stage.GameHUD; import forge.adventure.stage.IAfterMatch; import forge.adventure.stage.WorldStage; import forge.adventure.util.*; import forge.adventure.world.WorldSave; import forge.gui.FThreads; import forge.screens.TransitionScreen; +import forge.sound.MusicPlaylist; import forge.sound.SoundSystem; import forge.util.Callback; import forge.util.MyRandom; @@ -378,7 +380,8 @@ public class EventScene extends MenuScene implements IAfterMatch { @Override public void enter() { super.enter(); - SoundSystem.instance.pause(); + GameHUD.getInstance().pauseMusic(); + SoundSystem.instance.setBackgroundMusic(MusicPlaylist.MENUS); scrollContainer.clear(); if (money != null) {