diff --git a/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java b/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java index f2a75c51e49..99cd9723d68 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java @@ -165,8 +165,7 @@ public class DeckSelectScene extends UIScene { buttons.get(i).layout(); } } - GameHUD.getInstance().pauseMusic(); - GameHUD.getInstance().playAudio(); + GameHUD.getInstance().switchAudio(); select(Current.player().getSelectedDeckIndex()); performTouch(scrollPane); //can use mouse wheel if available to scroll after selection super.enter(); diff --git a/forge-gui-mobile/src/forge/adventure/scene/DraftScene.java b/forge-gui-mobile/src/forge/adventure/scene/DraftScene.java index 28abdec2c81..aa60dc97011 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/DraftScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/DraftScene.java @@ -31,8 +31,7 @@ public class DraftScene extends ForgeScene { @Override public void enter() { GameHUD.getInstance().getTouchpad().setVisible(false); - GameHUD.getInstance().pauseMusic(); - GameHUD.getInstance().playAudio(); + GameHUD.getInstance().switchAudio(); screen = null; getScreen(); screen.refresh(); diff --git a/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java b/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java index 0f5462ae7d7..3c157027339 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java @@ -153,13 +153,7 @@ public class DuelScene extends ForgeScene { void afterGameEnd(String enemyName, boolean winner) { Forge.restrictAdvMenus = winner; endRunnable = () -> Gdx.app.postRunnable(()-> { - if (GameScene.instance().isNotInWorldMap()) { - SoundSystem.instance.pause(); - GameHUD.getInstance().playAudio(); - } else { - SoundSystem.instance.setBackgroundMusic(MusicPlaylist.MENUS); - SoundSystem.instance.resume(); - } + GameHUD.getInstance().switchAudio(); dungeonEffect = null; callbackExit = false; Forge.clearTransitionScreen(); diff --git a/forge-gui-mobile/src/forge/adventure/scene/EventScene.java b/forge-gui-mobile/src/forge/adventure/scene/EventScene.java index 1489c1fce7c..adb4307cd0f 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/EventScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/EventScene.java @@ -384,8 +384,7 @@ public class EventScene extends MenuScene implements IAfterMatch { @Override public void enter() { super.enter(); - GameHUD.getInstance().pauseMusic(); - GameHUD.getInstance().playAudio(); + GameHUD.getInstance().switchAudio(); scrollContainer.clear(); if (money != null) { diff --git a/forge-gui-mobile/src/forge/adventure/scene/InnScene.java b/forge-gui-mobile/src/forge/adventure/scene/InnScene.java index da33a4bd209..5c8e3ab9539 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/InnScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/InnScene.java @@ -98,8 +98,7 @@ public class InnScene extends UIScene { public void enter() { super.enter(); refreshStatus(); - GameHUD.getInstance().pauseMusic(); - GameHUD.getInstance().playAudio(); + GameHUD.getInstance().switchAudio(); } private void refreshStatus(){ diff --git a/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java b/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java index 7ada1616077..1d51a099308 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/PlayerStatisticScene.java @@ -187,10 +187,7 @@ public class PlayerStatisticScene extends UIScene { @Override public void enter() { super.enter(); - - GameHUD.getInstance().pauseMusic(); - GameHUD.getInstance().playAudio(); - + GameHUD.getInstance().switchAudio(); achievementContainer.clear(); updateAchievements(cardActivation, true); updateAchievements(planeswalkers, true); diff --git a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java index e154db9ae5b..1e028118286 100644 --- a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java +++ b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java @@ -385,6 +385,12 @@ public class GameHUD extends Stage { private Pair audio = null; + public void switchAudio() { + if (GameScene.instance().isNotInWorldMap()) { + pauseMusic(); + playAudio(); + } + } public void playAudio() { switch (GameScene.instance().getAdventurePlayerLocation(false, false)) { case "capital":