Mummy attack :)

This commit is contained in:
Richard Davey
2013-08-30 18:56:10 +01:00
parent e77f5da2cd
commit 54d98944e4
6 changed files with 112 additions and 53 deletions
+6 -34
View File
@@ -243,7 +243,8 @@ Phaser.Game.prototype = {
return;
}
if (!document.body) {
if (!document.body)
{
window.setTimeout(this._onBoot, 20);
}
else
@@ -351,42 +352,13 @@ Phaser.Game.prototype = {
// this.stage.update();
// this.sound.update();
// this.physics.update();
// this.world.update();
this.world.update();
this.state.update();
this.plugins.update();
if (this._loadComplete)
{
this.state.update();
// this.world.postUpdate();
this.plugins.postUpdate();
this.plugins.preRender();
this.renderer.render(this.world._stage);
this.state.preRender();
this.renderer.render(this.world._stage);
this.plugins.render();
this.state.render();
this.plugins.postRender();
}
else
{
// Still loading assets
this.state.loadUpdate();
// this.world.postUpdate();
this.plugins.postUpdate();
this.plugins.preRender();
this.renderer.render(this.world._stage);
this.plugins.render();
this.state.loadRender();
this.plugins.postRender();
}
this.plugins.postRender();
},
+24 -13
View File
@@ -24,6 +24,12 @@ Phaser.StateManager.prototype = {
*/
_pendingState: null,
/**
* Flag that sets if the State has been created or not.
* @type {Boolean}
*/
_created: false,
/**
* The state to be switched to in the next frame.
* @type {Object}
@@ -257,6 +263,8 @@ Phaser.StateManager.prototype = {
{
this.onCreateCallback.call(this.callbackContext);
}
this._created = true;
}
else
{
@@ -275,6 +283,8 @@ Phaser.StateManager.prototype = {
this.onCreateCallback.call(this.callbackContext);
}
this._created = true;
this.game.loadComplete();
}
@@ -336,6 +346,7 @@ Phaser.StateManager.prototype = {
this.onShutDownCallback = this.states[key]['shutdown'] || this.dummy;
this.current = key;
this._created = false;
this.onInitCallback.call(this.callbackContext);
@@ -345,22 +356,15 @@ Phaser.StateManager.prototype = {
// console.log('Phaser.StateManager.loadComplete');
if (this.onCreateCallback) {
if (this._created == false && this.onCreateCallback)
{
// console.log('Create callback found');
this.onCreateCallback.call(this.callbackContext);
this._created = true;
}
},
loadUpdate: function () {
if (this.onLoadUpdateCallback)
{
this.onLoadUpdateCallback.call(this.callbackContext);
}
},
loadRender: function () {
if (this.onLoadRenderCallback)
@@ -372,9 +376,16 @@ Phaser.StateManager.prototype = {
update: function () {
if (this.onUpdateCallback)
{
this.onUpdateCallback.call(this.callbackContext);
if (this._created && this.onUpdateCallback)
{
this.onUpdateCallback.call(this.callbackContext);
}
else
{
if (this.onLoadUpdateCallback)
{
this.onLoadUpdateCallback.call(this.callbackContext);
}
}
},
+10
View File
@@ -16,6 +16,7 @@ Phaser.World.prototype = {
_stage: null,
_container: null,
_length: 0,
bounds: null,
@@ -38,6 +39,15 @@ Phaser.World.prototype = {
return gameobject;
},
update: function () {
for (var child in this._container.children)
{
this._container.children[child].update();
}
},
/**
* Updates the size of this world.
*
+1 -1
View File
@@ -109,7 +109,7 @@ Phaser.Sprite.prototype.constructor = Phaser.Sprite;
/**
* Automatically called after update() by the game loop for all 'alive' objects.
*/
Phaser.Sprite.prototype.postUpdate = function() {
Phaser.Sprite.prototype.update = function() {
this.animations.update();
// this.checkBounds();