TerranQuest
/
App
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adjusted music system

Browse Source
master
Skylar Ittner 8 years ago
parent 3e49d0d928
commit 93113b8501
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
www/js/music.js
Unescape Escape View File

@ -43,7 +43,7 @@ function playAudio() {
return; return;
} }
// If something is going on, come back in 10 seconds. // If something is going on, come back in 10 seconds.
if (audio_doneplaying && audio_isplaying) { if ((audio_doneplaying && audio_isplaying) || !lockGot) {
setTimeout(playAudio, 10 * 1000); setTimeout(playAudio, 10 * 1000);
return; return;
} }
@ -52,7 +52,7 @@ function playAudio() {
queuesong("Sisters of Snow Assent.mp3"); queuesong("Sisters of Snow Assent.mp3");
} else if (rawWeatherData.icon == "rain" || terrainType == 0) { } else if (rawWeatherData.icon == "rain" || terrainType == 0) {
queuesong("We Dream of Booty.mp3"); queuesong("We Dream of Booty.mp3");
} else if (terrainType >= 1 && terrainType <= 5) { } else if (terrainType >= 1 && terrainType <= 6) {
queuesong("Enter the Woods.mp3"); queuesong("Enter the Woods.mp3");
} else { } else {
queuesong("Heroes March.mp3"); queuesong("Heroes March.mp3");