Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-16 09:48:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1315 from pjbaron/dev

Browse source 
Minor logic fix and updateRender change
This commit is contained in:
Richard Davey 2014-11-12 09:18:36 +00:00
commit 26e74fef18
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/core/Game.js
View file

@ -719,7 +719,8 @@ Phaser.Game.prototype = {
this._deltaTime = 0;
this._spiralling = 0;
var slowStep = this.time.slowMotion * 1000.0 / this.time.desiredFps;
// call the game render update exactly once every frame
this.updateRender(this.time.slowMotion * this.time.desiredFps);
}
else
{
@ -757,10 +758,10 @@ Phaser.Game.prototype = {
}
this._lastCount = count;
}
// call the game render update exactly once every frame
this.updateRender(this._deltaTime / slowStep);
// call the game render update exactly once every frame unless we're playing catch-up from a spiral condition
this.updateRender(this._deltaTime / slowStep);
}
},

4
src/physics/arcade/World.js
View file

@ -652,9 +652,9 @@ Phaser.Physics.Arcade.prototype = {
var len = group.children.length;
for (var i = 0; i < len; i++)
for (var i = 0; i < len - 1; i++)
{
for (var j = i + 1; j <= len; j++)
for (var j = i + 1; j < len; j++)
{
if (group.children[i] && group.children[j] && group.children[i].exists && group.children[j].exists)
{