Skip to content

Commit 04afb72

Browse files
committed
Fixed accidental var overwrite
1 parent 25977cf commit 04afb72

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

v3/src/physics/impact/CollisionMap.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ var CollisionMap = new Class({
8383

8484
var t = 0;
8585
var tilesize = this.tilesize;
86-
var width = this.width;
87-
var height = this.height;
86+
var mapWidth = this.width;
87+
var mapHeight = this.height;
8888

8989
// Horizontal
9090
if (vx)
@@ -93,17 +93,17 @@ var CollisionMap = new Class({
9393
var tileOffsetX = (vx < 0) ? tilesize : 0;
9494

9595
var firstTileY = Math.max(Math.floor(y / tilesize), 0);
96-
var lastTileY = Math.min(Math.ceil((y + height) / tilesize), height);
96+
var lastTileY = Math.min(Math.ceil((y + height) / tilesize), mapHeight);
9797
var tileX = Math.floor((res.pos.x + pxOffsetX) / tilesize);
9898

9999
var prevTileX = Math.floor((x + pxOffsetX) / tilesize);
100100

101-
if (step > 0 || tileX == prevTileX || prevTileX < 0 || prevTileX >= width)
101+
if (step > 0 || tileX === prevTileX || prevTileX < 0 || prevTileX >= mapWidth)
102102
{
103103
prevTileX = -1;
104104
}
105105

106-
if (tileX >= 0 && tileX < width)
106+
if (tileX >= 0 && tileX < mapWidth)
107107
{
108108
for (var tileY = firstTileY; tileY < lastTileY; tileY++)
109109
{
@@ -143,17 +143,17 @@ var CollisionMap = new Class({
143143
var tileOffsetY = (vy < 0) ? tilesize : 0;
144144

145145
var firstTileX = Math.max(Math.floor(res.pos.x / tilesize), 0);
146-
var lastTileX = Math.min(Math.ceil((res.pos.x + width) / tilesize), width);
146+
var lastTileX = Math.min(Math.ceil((res.pos.x + width) / tilesize), mapWidth);
147147
var tileY = Math.floor((res.pos.y + pxOffsetY) / tilesize);
148148

149149
var prevTileY = Math.floor((y + pxOffsetY) / tilesize);
150150

151-
if (step > 0 || tileY == prevTileY || prevTileY < 0 || prevTileY >= height)
151+
if (step > 0 || tileY === prevTileY || prevTileY < 0 || prevTileY >= mapHeight)
152152
{
153153
prevTileY = -1;
154154
}
155155

156-
if (tileY >= 0 && tileY < height)
156+
if (tileY >= 0 && tileY < mapHeight)
157157
{
158158
for (var tileX = firstTileX; tileX < lastTileX; tileX++)
159159
{
@@ -169,7 +169,7 @@ var CollisionMap = new Class({
169169

170170
t = this.data[tileY][tileX];
171171

172-
if (t == 1 || (t > 1 && this._checkTileDef(res, t, x, y, rvx, rvy, width, height, tileX, tileY)))
172+
if (t === 1 || (t > 1 && this.checkDef(res, t, x, y, rvx, rvy, width, height, tileX, tileY)))
173173
{
174174
if (t > 1 && res.collision.slope)
175175
{

0 commit comments

Comments
 (0)