Commit 524ba0f9 authored by Clement Gournay's avatar Clement Gournay

Sound gestion improved

parent b868c259
......@@ -39,7 +39,7 @@ function Controller(selectedSong, songData){
_game.updateTime();
_view.refresh();
}
else if(ms>=0 && !started){ //when music starts
else if(ms>=0 && !started){ //when music shall starts
assets.sounds["main-music"].play();
started=true;
}
......@@ -93,9 +93,9 @@ function Controller(selectedSong, songData){
}
this.restartSong = function(){
_game.pauseSound("main-music", true);
assets.sounds["main-music"].pause();
assets.sounds["main-music"].currentTime=0;
clearInterval(_mainLoop);
//songData.circles.forEach(function(circle){
$("#screen").load("/src/views/game.html", function(){
var taikoGame = new Controller(selectedSong, songData);
taikoGame.run();
......
......@@ -222,11 +222,11 @@ function Game(controller, selectedSong, songData){
this.toggleMainMusic = function(){
if(_mainMusicPlaying){
_soundSystem.pauseSound("main-music", false);
assets.sounds["main-music"].pause();
_mainMusicPlaying=false;
}
else{
_soundSystem.playSound("main-music");
assets.sounds["main-music"].play();
_mainMusicPlaying=true;
}
}
......
......@@ -29,11 +29,6 @@ function soundSystem(controller){
}
}
this.pauseSound = function(soundID, stop){
_sounds[soundID].pause();
if(stop) _sounds[soundID].currentTime=0;
}
this.fadeOutMusic = function(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment