Merge pull request #166 from Dovyski/fix_issue_37

Fix issue #37 FlxTilemap.overlapsWithCallback calls callback when no overlapping
FlixelCommunity · Aug 20, 2013 · 99447a0 · 99447a0
2 parents bdaeb9f + 340ec63
commit 99447a0
Showing 1 changed file with 15 additions and 20 deletions.
diff --git a/org/flixel/FlxTilemap.as b/org/flixel/FlxTilemap.as
@@ -954,37 +954,32 @@ package org.flixel
 				column = selectionX;
 				while(column < selectionWidth)
 				{
-					overlapFound = false;
-					tile = _tileObjects[_data[rowStart+column]] as FlxTile;
+					tile = _tileObjects[_data[rowStart + column]] as FlxTile;
+					tile.x = X+column*_tileWidth;
+					tile.y = Y+row*_tileHeight;
+					tile.last.x = tile.x - deltaX;
+					tile.last.y = tile.y - deltaY;
+					overlapFound = (Object.x + Object.width > tile.x) && (Object.x < tile.x + tile.width) && (Object.y + Object.height > tile.y) && (Object.y < tile.y + tile.height);
+
 					if(tile.allowCollisions)
 					{
-						tile.x = X+column*_tileWidth;
-						tile.y = Y+row*_tileHeight;
-						tile.last.x = tile.x - deltaX;
-						tile.last.y = tile.y - deltaY;
 						if(Callback != null)
 						{
 							if(FlipCallbackParams)
 								overlapFound = Callback(Object,tile);
 							else
 								overlapFound = Callback(tile,Object);
 						}
-						else
-							overlapFound = (Object.x + Object.width > tile.x) && (Object.x < tile.x + tile.width) && (Object.y + Object.height > tile.y) && (Object.y < tile.y + tile.height);
-						if(overlapFound)
+					}	
+					if(overlapFound)
+					{
+						if((tile.callback != null) && ((tile.filter == null) || (Object is tile.filter)))
 						{
-							if((tile.callback != null) && ((tile.filter == null) || (Object is tile.filter)))
-							{
-								tile.mapIndex = rowStart+column;
-								tile.callback(tile,Object);
-							}
-							results = true;
+							tile.mapIndex = rowStart+column;
+							tile.callback(tile,Object);
 						}
-					}
-					else if((tile.callback != null) && ((tile.filter == null) || (Object is tile.filter)))
-					{
-						tile.mapIndex = rowStart+column;
-						tile.callback(tile,Object);
+						if(tile.allowCollisions)
+							results = true;
 					}
 					column++;
 				}