peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2025-02-22 22:49:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed enabled pref in GameMusic

Browse Source
This commit is contained in:
Johannes Schmelz 2024-12-06 15:56:42 +01:00
parent 2aca94100e
commit 551786bf30
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Projekte/monopoly/client/src/main/java/pp/monopoly/client/GameMusic.java
View File

@ -69,7 +69,10 @@ public class GameMusic extends AbstractAppState {
/** /**
* Plays the main music. * Plays the main music.
*/ */
public void playMainMusic() { private void playMainMusic() {
if (!isEnabled()) {
return; // Sound is disabled
}
if (mainMusic != null && !isMainMusicPlaying) { if (mainMusic != null && !isMainMusicPlaying) {
mainMusic.play(); mainMusic.play();
isMainMusicPlaying = true; isMainMusicPlaying = true;
@ -79,7 +82,7 @@ public class GameMusic extends AbstractAppState {
/** /**
* Stops the main music. * Stops the main music.
*/ */
public void stopMainMusic() { private void stopMainMusic() {
if (mainMusic != null && isMainMusicPlaying) { if (mainMusic != null && isMainMusicPlaying) {
mainMusic.stop(); mainMusic.stop();
isMainMusicPlaying = false; isMainMusicPlaying = false;
@ -92,7 +95,10 @@ public class GameMusic extends AbstractAppState {
* @param app The application instance * @param app The application instance
* @param secondaryMusicFile The file path of the secondary audio file * @param secondaryMusicFile The file path of the secondary audio file
*/ */
public void playSecondaryMusic() { private void playSecondaryMusic() {
if(!isEnabled()) {
return;
}
if (isSecondaryMusicPlaying) { if (isSecondaryMusicPlaying) {
return; // Secondary music is already playing return; // Secondary music is already playing
} }
@ -109,7 +115,7 @@ public class GameMusic extends AbstractAppState {
/** /**
* Stops the secondary music. * Stops the secondary music.
*/ */
public void stopSecondaryMusic() { private void stopSecondaryMusic() {
if (secondaryMusic != null && isSecondaryMusicPlaying) { if (secondaryMusic != null && isSecondaryMusicPlaying) {
secondaryMusic.stop(); secondaryMusic.stop();
isSecondaryMusicPlaying = false; isSecondaryMusicPlaying = false;
@ -125,6 +131,9 @@ public class GameMusic extends AbstractAppState {
* @param secondaryMusicFile The file path of the secondary audio file * @param secondaryMusicFile The file path of the secondary audio file
*/ */
public void toggleMusic() { public void toggleMusic() {
if(!isEnabled()) {
return;
}
if (isSecondaryMusicPlaying) { if (isSecondaryMusicPlaying) {
stopSecondaryMusic(); stopSecondaryMusic();
playMainMusic(); playMainMusic();