wassname/phaser
1
0
Fork 0
mirror of https://github.com/wassname/phaser.git synced 2026-07-11 00:40:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

StateManager fixes for when you change state in the create function.

Browse Source 
TilemapLayer update for WebGL.
This commit is contained in:
photonstorm
2014-02-26 00:58:19 +00:00
parent d958b34f43
commit 994eaff92b
11 changed files with 310 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/StateManager.js
+5 -11
View File
@@ -141,13 +141,12 @@ Phaser.StateManager.prototype = {
if (typeof this._pendingState === 'string')
{
// State was already added, so just start it
this.start(this._pendingState, false, false);
// this.start(this._pendingState, false, false);
}
else
{
this.add('default', this._pendingState, true);
}
}
},
@@ -251,12 +250,6 @@ Phaser.StateManager.prototype = {
{
this._args = Array.prototype.splice.call(arguments, 3);
}
// Already got a state running?
if (this.current)
{
this.onShutDownCallback.call(this.callbackContext, this.game);
}
}
},
@@ -307,7 +300,6 @@ Phaser.StateManager.prototype = {
if (this.game.load.totalQueuedFiles() === 0)
{
this.loadComplete();
// this.game.loadComplete();
}
else
{
@@ -319,10 +311,12 @@ Phaser.StateManager.prototype = {
{
// No init? Then there was nothing to load either
this.loadComplete();
// this.game.loadComplete();
}
this._pendingState = null;
if (this.current === this._pendingState)
{
this._pendingState = null;
}
}
},