Fix max overlap check in overrides.js

voithos · Dec 26, 2013 · 1556f8b · 1556f8b
1 parent e452e68
commit 1556f8b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/main.js b/src/main.js
@@ -50,17 +50,17 @@ function create() {
  cfg.FLOATING_TILES.forEach(function(tile) {
  var t = tileset.getTile(tile);
  t.setCollision(false, false, true, false);
- t.disableMaxOverlapCheck = false;
+ t.enableMaxOverlapCheck = true;
  });
  cfg.UPWARD_SLOPE_TILES.forEach(function(tile) {
  var t = tileset.getTile(tile);
  t.setCollision(false, false, true, false);
- t.disableMaxOverlapCheck = true;
+ t.enableMaxOverlapCheck = false;
  });
  cfg.DOWNWARD_SLOPE_TILES.forEach(function(tile) {
  var t = tileset.getTile(tile);
  t.setCollision(false, false, true, false);
- t.disableMaxOverlapCheck = true;
+ t.enableMaxOverlapCheck = false;
  });
  cfg.BACKGROUND_TILES.forEach(function(tile) {
  tileset.setCollision(tile, false, false, false, false);

diff --git a/src/overrides.js b/src/overrides.js
@@ -25,7 +25,7 @@ if (typeof Phaser !== 'undefined') {
  // Moving left
  this._overlap = tile.right - body.hullX.x;
 
- if ((this._overlap > this._maxOverlap && !tile.tile.disableMaxOverlapCheck) || body.allowCollision.left === false || tile.tile.collideRight === false)
+ if ((tile.tile.enableMaxOverlapCheck && this._overlap > this._maxOverlap) || body.allowCollision.left === false || tile.tile.collideRight === false)
  // if (body.allowCollision.left === false || tile.tile.collideRight === false)
  {
  this._overlap = 0;
@@ -40,7 +40,7 @@ if (typeof Phaser !== 'undefined') {
  // Moving right
  this._overlap = body.hullX.right - tile.x;
 
- if ((this._overlap > this._maxOverlap && !tile.tile.disableMaxOverlapCheck) || body.allowCollision.right === false || tile.tile.collideLeft === false)
+ if ((tile.tile.enableMaxOverlapCheck && this._overlap > this._maxOverlap) || body.allowCollision.right === false || tile.tile.collideLeft === false)
  // if (body.allowCollision.right === false || tile.tile.collideLeft === false)
  {
  this._overlap = 0;
@@ -104,7 +104,7 @@ if (typeof Phaser !== 'undefined') {
  // Moving up
  this._overlap = tile.bottom - body.hullY.y;
 
- if ((this._overlap > this._maxOverlap && !tile.tile.disableMaxOverlapCheck) || body.allowCollision.up === false || tile.tile.collideDown === false)
+ if ((tile.tile.enableMaxOverlapCheck && this._overlap > this._maxOverlap) || body.allowCollision.up === false || tile.tile.collideDown === false)
  // if (body.allowCollision.up === false || tile.tile.collideDown === false)
  {
  this._overlap = 0;
@@ -119,7 +119,7 @@ if (typeof Phaser !== 'undefined') {
  // Moving down
  this._overlap = body.hullY.bottom - tile.y;
 
- if ((this._overlap > this._maxOverlap && !tile.tile.disableMaxOverlapCheck) || body.allowCollision.down === false || tile.tile.collideUp === false)
+ if ((tile.tile.enableMaxOverlapCheck && this._overlap > this._maxOverlap) || body.allowCollision.down === false || tile.tile.collideUp === false)
  // if (body.allowCollision.down === false || tile.tile.collideUp === false)
  {
  this._overlap = 0;