Continuité de la musique entre les menus

TeleGD · Jan 24, 2020 · 87163b1 · 87163b1
1 parent 9679868
commit 87163b1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/src/pages/Choice.java b/src/pages/Choice.java
@@ -45,12 +45,9 @@ public void itemSelected() {
 	@Override
 	public void enter(GameContainer container, StateBasedGame game) {
 		super.enter(container, game);
-		this.music.playAsMusic(1, .4f, true);
-	}
-
-	@Override
-	public void leave(GameContainer container, StateBasedGame game) {
-		this.music.stop();
+		if (!this.music.isPlaying()) {
+			this.music.playAsMusic(1, .4f, true);
+		}
 	}
 
 }
diff --git a/src/pages/Rules.java b/src/pages/Rules.java
@@ -28,12 +28,9 @@ public void init(GameContainer container, StateBasedGame game) {
 
 	@Override
 	public void enter(GameContainer container, StateBasedGame game) {
-		this.music.playAsMusic(1, .4f, true);
-	}
-
-	@Override
-	public void leave(GameContainer container, StateBasedGame game) {
-		this.music.stop();
+		if (!this.music.isPlaying()) {
+			this.music.playAsMusic(1, .4f, true);
+		}
 	}
 
 	@Override

diff --git a/src/pages/Welcome.java b/src/pages/Welcome.java
@@ -65,12 +65,9 @@ public void init(GameContainer container, StateBasedGame game) {
 
 	@Override
 	public void enter(GameContainer container, StateBasedGame game) {
-		this.music.playAsMusic(1, .4f, true);
-	}
-
-	@Override
-	public void leave(GameContainer container, StateBasedGame game) {
-		this.music.stop();
+		if (!this.music.isPlaying()) {
+			this.music.playAsMusic(1, .4f, true);
+		}
 	}
 
 	@Override