From d7428b4d277d502f222cb1cd8c077f01f5e467b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Drahom=C3=ADr=20Karch=C5=88=C3=A1k?=
<drahomir.karchnak@nic.cz>
Date: Mon, 11 Apr 2016 12:16:30 +0200
Subject: [PATCH] #324 Fixed playing of sounds when changing difficulty.
---
.../screen/gamemenu/pages/GameMenuPage.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java b/core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java
index f8fa14e5c..b2142dbf4 100644
--- a/core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java
+++ b/core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java
@@ -96,8 +96,8 @@ public class GameMenuPage extends MenuPage {
private Music introSound;
- //Can we play the step sounds on difficulty change ?
- private boolean stepSoundsReady = false;
+ //Enabled playing sound steps on difficulty change
+ private boolean stepSoundsEnabled = false;
//Step sounds assets
private Music step_easy_medium, step_medium_easy;
@@ -372,10 +372,8 @@ public class GameMenuPage extends MenuPage {
difficulty = GameDifficulty.DEFAULT_DIFFICULTY;
}
- if(stepSoundsReady) {
+ if (stepSoundsEnabled) {
playStepSound(gameDifficulty, difficulty);
- } else {
- stepSoundsReady = true;
}
difficultyChanged(difficulty);
@@ -393,6 +391,9 @@ public class GameMenuPage extends MenuPage {
});
gameDifficulty = TablexiaSettings.getInstance().getGameDifficulty(game);
dragSwitchListener.switchToStep(gameDifficulty.getDifficultyNumber() - 1);
+ //Enabling step sounds later
+ //so it doesn't play 'em when initially setting difficulties from database...
+ stepSoundsEnabled = true;
}
/**
@@ -544,4 +545,4 @@ public class GameMenuPage extends MenuPage {
public void setIsFirstLogin(boolean isFirstLogin) {
this.isFirstLogin = isFirstLogin;
}
-}
+}
\ No newline at end of file
--
GitLab