Skip to content

Commit 2d94776

Browse files
committed
Merge branch 'master' of https://github.com/photonstorm/phaser
2 parents 600b226 + 9b09d32 commit 2d94776

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/cameras/2d/BaseCamera.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -802,8 +802,8 @@ var BaseCamera = new Class({
802802
var sy = y + ((scrollX * s + scrollY * c) * zoom);
803803

804804
// Apply transform to point
805-
output.x = (sx * ima + sy * imc + ime) * res;
806-
output.y = (sx * imb + sy * imd + imf) * res;
805+
output.x = (sx * ima + sy * imc) * res + ime;
806+
output.y = (sx * imb + sy * imd) * res + imf;
807807

808808
return output;
809809
},

src/gameobjects/UpdateList.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,14 +265,14 @@ var UpdateList = new Class({
265265

266266
while (i--)
267267
{
268-
this.this._pendingRemoval[i].destroy(true);
268+
this._pendingRemoval[i].destroy(true);
269269
}
270270

271271
i = this._pendingInsertion.length;
272272

273273
while (i--)
274274
{
275-
this.this._pendingInsertion[i].destroy(true);
275+
this._pendingInsertion[i].destroy(true);
276276
}
277277

278278
this._list.length = 0;

0 commit comments

Comments
 (0)