Merge branch 'master' into rendering-cleanup

bitnenfer · bitnenfer · commit 086eec1616d2 · 2018-01-23T16:30:50.000-03:00
diff --git a/src/loader/filetypes/AudioFile.js b/src/loader/filetypes/AudioFile.js
@@ -81,11 +81,11 @@ AudioFile.create = function (loader, key, urls, config, xhrSettings)
 
     if (deviceAudio.webAudio && !(audioConfig && audioConfig.disableWebAudio))
     {
-        return new AudioFile(key, url, this.path, xhrSettings, game.sound.context);
+        return new AudioFile(key, url, loader.path, xhrSettings, game.sound.context);
     }
     else
     {
-        return new HTML5AudioFile(key, url, this.path, config, game.sound.locked);
+        return new HTML5AudioFile(key, url, loader.path, config, game.sound.locked);
     }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -81,11 +81,11 @@ AudioFile.create = function (loader, key, urls, config, xhrSettings)`
`81`	`81`
`82`	`82`	`if (deviceAudio.webAudio && !(audioConfig && audioConfig.disableWebAudio))`
`83`	`83`	`{`
`84`		`- return new AudioFile(key, url, this.path, xhrSettings, game.sound.context);`
	`84`	`+ return new AudioFile(key, url, loader.path, xhrSettings, game.sound.context);`
`85`	`85`	`}`
`86`	`86`	`else`
`87`	`87`	`{`
`88`		`- return new HTML5AudioFile(key, url, this.path, config, game.sound.locked);`
	`88`	`+ return new HTML5AudioFile(key, url, loader.path, config, game.sound.locked);`
`89`	`89`	`}`
`90`	`90`	`};`
`91`	`91`