First working pass at the Asset Pack Loader update.

photonstorm · photonstorm · commit 4004cc92e3c1 · 2014-05-29T15:57:47.000+01:00
diff --git a/resources/Asset Pack JSON Format/assetPack.json b/resources/Asset Pack JSON Format/assetPack.json
@@ -43,8 +43,8 @@
         },
         {
             "type": "audio",
-            "key": "soundFX",
-            "urls": [ "assets/audio/fx.mp3", "assets/audio/fx.ogg" ],
+            "key": "boden",
+            "urls": ["assets/audio/bodenstaendig_2000_in_rock_4bit.mp3", "assets/audio/bodenstaendig_2000_in_rock_4bit.ogg"],
             "autoDecode": true
         },
         {
diff --git a/src/core/StateManager.js b/src/core/StateManager.js
@@ -338,7 +338,7 @@ Phaser.StateManager.prototype = {
                 this.onPreloadCallback.call(this.callbackContext, this.game);
 
                 //  Is the loader empty?
-                if (this.game.load.totalQueuedFiles() === 0)
+                if (this.game.load.totalQueuedFiles() === 0 && this.game.load.totalQueuedPacks() === 0)
                 {
                     this.loadComplete();
                 }
diff --git a/src/loader/Loader.js b/src/loader/Loader.js

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@`
`43`	`43`	`},`
`44`	`44`	`{`
`45`	`45`	`"type": "audio",`
`46`		`- "key": "soundFX",`
`47`		`- "urls": [ "assets/audio/fx.mp3", "assets/audio/fx.ogg" ],`
	`46`	`+ "key": "boden",`
	`47`	`+ "urls": ["assets/audio/bodenstaendig_2000_in_rock_4bit.mp3", "assets/audio/bodenstaendig_2000_in_rock_4bit.ogg"],`
`48`	`48`	`"autoDecode": true`
`49`	`49`	`},`
`50`	`50`	`{`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ Phaser.StateManager.prototype = {`
`338`	`338`	`this.onPreloadCallback.call(this.callbackContext, this.game);`
`339`	`339`
`340`	`340`	`// Is the loader empty?`
`341`		`- if (this.game.load.totalQueuedFiles() === 0)`
	`341`	`+ if (this.game.load.totalQueuedFiles() === 0 && this.game.load.totalQueuedPacks() === 0)`
`342`	`342`	`{`
`343`	`343`	`this.loadComplete();`
`344`	`344`	`}`