Merge pull request #92 from John-Kun/master

Fix collision generation algoithm for tile size past 16

Author: TrianglyRU

scripts/collision_generate/collision_generate.gml

@@ -6,7 +6,8 @@
 /// @param {Real} off_y The vertical offset of the sprite on the tilemap.
 /// @param {Real} sep_x The horizontal spacing between tiles on the tilemap.
 /// @param {Real} sep_y The vertical spacing between tiles on the tilemap.
-function collision_generate(_sprite_id, _angle_data, _off_x = 0, _off_y = 0, _sep_x = 0, _sep_y = 0)
+/// @param {Real} row_limit Use this in case you have a row lower than tilemap size.
+function collision_generate(_sprite_id, _angle_data, _off_x = 0, _off_y = 0, _sep_x = 0, _sep_y = 0, _row_limit = ENGINE_TILE_SIZE)
 {
     // Initialise arrays and variables for collision data
 	var _height_arr = array_create(ENGINE_TILE_COUNT, 0);
@@ -37,10 +38,10 @@ function collision_generate(_sprite_id, _angle_data, _off_x = 0, _off_y = 0, _se
 
 	// Generate collision data for each tile
 	for (var i = 1; i < ENGINE_TILE_COUNT; i++)
-	{
+	{		
 		var _tile = sprite_create_from_surface
 		(
-			_surface, _off_x + _xcell_size * (i % ENGINE_TILE_SIZE), _off_y + _ycell_size * floor(i / ENGINE_TILE_SIZE), ENGINE_TILE_SIZE, ENGINE_TILE_SIZE, false, false, 0, 0
+			_surface, _off_x + _xcell_size * (i % _row_limit), _off_y + _ycell_size * floor(i / _row_limit), ENGINE_TILE_SIZE, ENGINE_TILE_SIZE, false, false, 0, 0
 		);
 
 		_height_arr[i] = array_create(ENGINE_TILE_SIZE);
@@ -60,7 +61,6 @@ function collision_generate(_sprite_id, _angle_data, _off_x = 0, _off_y = 0, _se
 				}
 			}
 		}
-
 		sprite_delete(_tile);
 	}