Skip to content

Commit

Permalink
Final variables in sound folder are uppercase
Browse files Browse the repository at this point in the history
  • Loading branch information
Hermann Andreas Kran committed Apr 21, 2024
1 parent 06652d0 commit 133c79e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions core/src/no/ntnu/game/Sound/ChopSoundEffectPlayer.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
import com.badlogic.gdx.audio.Sound;

public class ChopSoundEffectPlayer implements SoundPlayer {
private final Sound chopSoundEffect;
private final Settings settings;
private final Sound CHOP_SOUND_EFFECT;
private final Settings SETTINGS;

public ChopSoundEffectPlayer() {
chopSoundEffect = Gdx.audio.newSound(Gdx.files.internal("audio_cut.mp3"));
settings = StarKnight.getSettings();
CHOP_SOUND_EFFECT = Gdx.audio.newSound(Gdx.files.internal("audio_cut.mp3"));
SETTINGS = StarKnight.getSettings();
}

@Override
public void play() {
chopSoundEffect.play(settings.getEffectVolume() * 0.5f);
CHOP_SOUND_EFFECT.play(SETTINGS.getEffectVolume() * 0.5f);
}

@Override
Expand Down
12 changes: 6 additions & 6 deletions core/src/no/ntnu/game/Sound/MusicPlayer.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@

public class MusicPlayer implements SoundPlayer, GameRoomObserver {
private static MusicPlayer instance;
private final Music backgroundMusic;
private final Music BACKGROUND_MUSIC;

private MusicPlayer() {
backgroundMusic = Gdx.audio.newMusic(Gdx.files.internal("HinaCC0_011_Fallen_leaves(chosic.com).mp3"));
backgroundMusic.setVolume(Settings.getInstance().getMusicVolume());
backgroundMusic.setLooping(true);
BACKGROUND_MUSIC = Gdx.audio.newMusic(Gdx.files.internal("HinaCC0_011_Fallen_leaves(chosic.com).mp3"));
BACKGROUND_MUSIC.setVolume(Settings.getInstance().getMusicVolume());
BACKGROUND_MUSIC.setLooping(true);
}

public static MusicPlayer getMusicPlayer() {
Expand All @@ -26,12 +26,12 @@ public static MusicPlayer getMusicPlayer() {

@Override
public void play() {
backgroundMusic.play();
BACKGROUND_MUSIC.play();
}

@Override
public void stop() {
backgroundMusic.stop();
BACKGROUND_MUSIC.stop();
}

@Override
Expand Down

0 comments on commit 133c79e

Please sign in to comment.