Skip to content

Commit c1400f9

Browse files
photonstormphotonstorm
committed
Fixed lots of Tilemap methods that claimed to return null but didn't
1 parent 0514d27 commit c1400f9

1 file changed

Lines changed: 44 additions & 53 deletions

File tree

‎src/tilemaps/Tilemap.js‎

Lines changed: 44 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -440,9 +440,13 @@ var Tilemap = new Class({
440440
destTileX, destTileY,
441441
recalculateFaces, layer
442442
);
443-
}
444443

445-
return this;
444+
return this;
445+
}
446+
else
447+
{
448+
return null;
449+
}
446450
},
447451

448452
/**
@@ -797,12 +801,11 @@ var Tilemap = new Class({
797801
{
798802
layer = this.getLayer(layer);
799803

804+
if (layer === null) { return null; }
805+
800806
if (this._isStaticCall(layer, 'fill')) { return this; }
801807

802-
if (layer !== null)
803-
{
804-
TilemapComponents.Fill(index, tileX, tileY, width, height, recalculateFaces, layer);
805-
}
808+
TilemapComponents.Fill(index, tileX, tileY, width, height, recalculateFaces, layer);
806809

807810
return this;
808811
},
@@ -982,10 +985,9 @@ var Tilemap = new Class({
982985
{
983986
layer = this.getLayer(layer);
984987

985-
if (layer !== null)
986-
{
987-
TilemapComponents.ForEachTile(callback, context, tileX, tileY, width, height, filteringOptions, layer);
988-
}
988+
if (layer === null) { return null; }
989+
990+
TilemapComponents.ForEachTile(callback, context, tileX, tileY, width, height, filteringOptions, layer);
989991

990992
return this;
991993
},
@@ -1065,7 +1067,7 @@ var Tilemap = new Class({
10651067
{
10661068
var index = this.getIndex(this.objects, name);
10671069

1068-
return index !== null ? this.objects[index] : null;
1070+
return (index !== null) ? this.objects[index] : null;
10691071
},
10701072

10711073
/**
@@ -1163,14 +1165,9 @@ var Tilemap = new Class({
11631165
{
11641166
layer = this.getLayer(layer);
11651167

1166-
if (layer === null)
1167-
{
1168-
return null;
1169-
}
1170-
else
1171-
{
1172-
return TilemapComponents.GetTileAtWorldXY(worldX, worldY, nonNull, camera, layer);
1173-
}
1168+
if (layer === null) { return null; }
1169+
1170+
return TilemapComponents.GetTileAtWorldXY(worldX, worldY, nonNull, camera, layer);
11741171
},
11751172

11761173
/**
@@ -1441,10 +1438,9 @@ var Tilemap = new Class({
14411438

14421439
if (this._isStaticCall(layer, 'putTilesAt')) { return this; }
14431440

1444-
if (layer !== null)
1445-
{
1446-
TilemapComponents.PutTilesAt(tilesArray, tileX, tileY, recalculateFaces, layer);
1447-
}
1441+
if (layer === null) { return null; }
1442+
1443+
TilemapComponents.PutTilesAt(tilesArray, tileX, tileY, recalculateFaces, layer);
14481444

14491445
return this;
14501446
},
@@ -1477,10 +1473,9 @@ var Tilemap = new Class({
14771473

14781474
if (this._isStaticCall(layer, 'randomize')) { return this; }
14791475

1480-
if (layer !== null)
1481-
{
1482-
TilemapComponents.Randomize(tileX, tileY, width, height, indexes, layer);
1483-
}
1476+
if (layer === null) { return null; }
1477+
1478+
TilemapComponents.Randomize(tileX, tileY, width, height, indexes, layer);
14841479

14851480
return this;
14861481
},
@@ -1505,7 +1500,7 @@ var Tilemap = new Class({
15051500
{
15061501
layer = this.getLayer(layer);
15071502

1508-
if (layer === null) { return this; }
1503+
if (layer === null) { return null; }
15091504

15101505
TilemapComponents.CalculateFacesAt(tileX, tileY, layer);
15111506

@@ -1629,7 +1624,7 @@ var Tilemap = new Class({
16291624
{
16301625
if (layers[i].tilemapLayer)
16311626
{
1632-
layers[i].tilemapLayer.destroy();
1627+
layers[i].tilemapLayer.destroy(false);
16331628
}
16341629
}
16351630

@@ -1762,7 +1757,7 @@ var Tilemap = new Class({
17621757
{
17631758
layer = this.getLayer(layer);
17641759

1765-
if (layer === null) { return this; }
1760+
if (layer === null) { return null; }
17661761

17671762
TilemapComponents.RenderDebug(graphics, styleConfig, layer);
17681763

@@ -1796,10 +1791,9 @@ var Tilemap = new Class({
17961791

17971792
if (this._isStaticCall(layer, 'replaceByIndex')) { return this; }
17981793

1799-
if (layer !== null)
1800-
{
1801-
TilemapComponents.ReplaceByIndex(findIndex, newIndex, tileX, tileY, width, height, layer);
1802-
}
1794+
if (layer === null) { return null; }
1795+
1796+
TilemapComponents.ReplaceByIndex(findIndex, newIndex, tileX, tileY, width, height, layer);
18031797

18041798
return this;
18051799
},
@@ -1825,7 +1819,7 @@ var Tilemap = new Class({
18251819
{
18261820
layer = this.getLayer(layer);
18271821

1828-
if (layer === null) { return this; }
1822+
if (layer === null) { return null; }
18291823

18301824
TilemapComponents.SetCollision(indexes, collides, recalculateFaces, layer);
18311825

@@ -1855,7 +1849,7 @@ var Tilemap = new Class({
18551849
{
18561850
layer = this.getLayer(layer);
18571851

1858-
if (layer === null) { return this; }
1852+
if (layer === null) { return null; }
18591853

18601854
TilemapComponents.SetCollisionBetween(start, stop, collides, recalculateFaces, layer);
18611855

@@ -1887,7 +1881,7 @@ var Tilemap = new Class({
18871881
{
18881882
layer = this.getLayer(layer);
18891883

1890-
if (layer === null) { return this; }
1884+
if (layer === null) { return null; }
18911885

18921886
TilemapComponents.SetCollisionByProperty(properties, collides, recalculateFaces, layer);
18931887

@@ -1915,7 +1909,7 @@ var Tilemap = new Class({
19151909
{
19161910
layer = this.getLayer(layer);
19171911

1918-
if (layer === null) { return this; }
1912+
if (layer === null) { return null; }
19191913

19201914
TilemapComponents.SetCollisionByExclusion(indexes, collides, recalculateFaces, layer);
19211915

@@ -1943,7 +1937,7 @@ var Tilemap = new Class({
19431937
{
19441938
layer = this.getLayer(layer);
19451939

1946-
if (layer === null) { return this; }
1940+
if (layer === null) { return null; }
19471941

19481942
TilemapComponents.SetCollisionFromCollisionGroup(collides, recalculateFaces, layer);
19491943

@@ -1972,7 +1966,7 @@ var Tilemap = new Class({
19721966
{
19731967
layer = this.getLayer(layer);
19741968

1975-
if (layer === null) { return this; }
1969+
if (layer === null) { return null; }
19761970

19771971
TilemapComponents.SetTileIndexCallback(indexes, callback, callbackContext, layer);
19781972

@@ -2003,7 +1997,7 @@ var Tilemap = new Class({
20031997
{
20041998
layer = this.getLayer(layer);
20051999

2006-
if (layer === null) { return this; }
2000+
if (layer === null) { return null; }
20072001

20082002
TilemapComponents.SetTileLocationCallback(tileX, tileY, width, height, callback, callbackContext, layer);
20092003

@@ -2151,10 +2145,9 @@ var Tilemap = new Class({
21512145

21522146
if (this._isStaticCall(layer, 'shuffle')) { return this; }
21532147

2154-
if (layer !== null)
2155-
{
2156-
TilemapComponents.Shuffle(tileX, tileY, width, height, layer);
2157-
}
2148+
if (layer === null) { return null; }
2149+
2150+
TilemapComponents.Shuffle(tileX, tileY, width, height, layer);
21582151

21592152
return this;
21602153
},
@@ -2186,10 +2179,9 @@ var Tilemap = new Class({
21862179

21872180
if (this._isStaticCall(layer, 'swapByIndex')) { return this; }
21882181

2189-
if (layer !== null)
2190-
{
2191-
TilemapComponents.SwapByIndex(indexA, indexB, tileX, tileY, width, height, layer);
2192-
}
2182+
if (layer === null) { return null; }
2183+
2184+
TilemapComponents.SwapByIndex(indexA, indexB, tileX, tileY, width, height, layer);
21932185

21942186
return this;
21952187
},
@@ -2308,10 +2300,9 @@ var Tilemap = new Class({
23082300

23092301
if (this._isStaticCall(layer, 'weightedRandomize')) { return this; }
23102302

2311-
if (layer !== null)
2312-
{
2313-
TilemapComponents.WeightedRandomize(tileX, tileY, width, height, weightedIndexes, layer);
2314-
}
2303+
if (layer === null) { return null; }
2304+
2305+
TilemapComponents.WeightedRandomize(tileX, tileY, width, height, weightedIndexes, layer);
23152306

23162307
return this;
23172308
},

0 commit comments

Comments
 (0)