michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into Story1274_custom_boat_stats

Browse Source
This commit is contained in:
Kusal Ekanayake
2017-09-24 18:08:54 +13:00
parent 0a885dd8fd f6b41f0513
commit aa0149b9a7
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/utilities/Sounds.java
+13 -5
View File
@@ -14,8 +14,10 @@ public class Sounds {
private static MediaPlayer soundEffect; private static MediaPlayer soundEffect;
private static MediaPlayer soundPlayer; private static MediaPlayer soundPlayer;
private static MediaPlayer hoverSoundPlayer; private static MediaPlayer hoverSoundPlayer;
private static MediaPlayer crashSoundPlayer;
private static boolean hoverInitialized = false; private static boolean hoverInitialized = false;
private static boolean crashInitialized = false;
private static boolean musicMuted = false; private static boolean musicMuted = false;
private static boolean soundEffectsMuted = false; private static boolean soundEffectsMuted = false;
@@ -155,11 +157,17 @@ public class Sounds {
public static void playCrashSound() { public static void playCrashSound() {
if (!soundEffectsMuted) { if (!soundEffectsMuted) {
Media crashSound = new Media( if (!crashInitialized) {
Media pickupSound = new Media(
Sounds.class.getClassLoader().getResource("sounds/Large-metal-door-slam.mp3") Sounds.class.getClassLoader().getResource("sounds/Large-metal-door-slam.mp3")
.toString()); .toString());
soundPlayer = new MediaPlayer(crashSound); crashSoundPlayer = new MediaPlayer(pickupSound);
soundPlayer.play(); crashInitialized = true;
}
if (crashSoundPlayer != null) {
crashSoundPlayer.stop();
}
crashSoundPlayer.play();
} }
} }
@@ -176,10 +184,10 @@ public class Sounds {
public static void playHoverSound() { public static void playHoverSound() {
if (!soundEffectsMuted) { if (!soundEffectsMuted) {
if (!hoverInitialized) { if (!hoverInitialized) {
Media crashSound = new Media( Media hoverSound = new Media(
Sounds.class.getClassLoader().getResource("sounds/Error-sound-effect.mp3") Sounds.class.getClassLoader().getResource("sounds/Error-sound-effect.mp3")
.toString()); .toString());
hoverSoundPlayer = new MediaPlayer(crashSound); hoverSoundPlayer = new MediaPlayer(hoverSound);
hoverInitialized = true; hoverInitialized = true;
} }
hoverSoundPlayer.setVolume(0.5); hoverSoundPlayer.setVolume(0.5);