Commit b868c259 authored by Clement Gournay's avatar Clement Gournay

Sound gestion improved

parent 96677c86
...@@ -40,7 +40,7 @@ function Controller(selectedSong, songData){ ...@@ -40,7 +40,7 @@ function Controller(selectedSong, songData){
_view.refresh(); _view.refresh();
} }
else if(ms>=0 && !started){ //when music starts else if(ms>=0 && !started){ //when music starts
_game.playSound("main-music"); assets.sounds["main-music"].play();
started=true; started=true;
} }
......
...@@ -28,7 +28,9 @@ function Loader(){ ...@@ -28,7 +28,9 @@ function Loader(){
audio.src = '/assets/audio/'+name; audio.src = '/assets/audio/'+name;
audio.load(); audio.load();
audio.onloadeddata = function(){ audio.onloadeddata = function(){
assets.sounds[id] = audio; assets.sounds[id] = new Audio();
assets.sounds[id].src = audio.src;
assets.sounds[id].load();
_this.assetLoaded(); _this.assetLoaded();
}; };
}); });
......
...@@ -10,7 +10,7 @@ function loadSong(selectedSong){ ...@@ -10,7 +10,7 @@ function loadSong(selectedSong){
this.run = function(){ this.run = function(){
//assets.sounds["start"]["audio"][0].play(); assets.sounds["start"].play();
$("#assets").append("<img id='music-bg' src='/songs/"+_selectedSong.folder+"/bg.png' />"); $("#assets").append("<img id='music-bg' src='/songs/"+_selectedSong.folder+"/bg.png' />");
var audio = new Audio(); var audio = new Audio();
......
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