Order object layers properly when loading as an asset. Update test map for better...

diff --git a/main/assets.lua b/main/assets.lua
index 0a5c590831ee397f77b126d8b7390f64bbaef00b..05ec5de6a1b9fcd0d3bae907af52ad7c53757b4d 100644 (file)
--- a/main/assets.lua
+++ b/main/assets.lua
@@ -29,11 +29,11 @@ PropertyFlag =
 assets.PropertyFlag = PropertyFlag
 
 function assets.integrate_object_layers(pmap)
-  for k,layer in pairs(pmap.layers) do
+  for k,layer in ipairs(pmap.layers) do
     layer.keyreleased = function(self, key) end
 
     if layer.type == 'objectgroup' then
-      local new_layer = pmap:addCustomLayer('imported-' .. layer.name)
+      local new_layer = pmap:addCustomLayer('imported-' .. layer.name, k)
       new_layer.offsetx, new_layer.offsetx = layer.offsetx, layer.offsety
       new_layer.objects = layer.objects
 

diff --git a/main/main.lua b/main/main.lua
index 4ac30d941f40cabe0c4979670ae0f9a0983dc540..e9fdbfe890cb667ce7081ec9ad08a227bd1cd329 100644 (file)
--- a/main/main.lua
+++ b/main/main.lua
@@ -19,7 +19,7 @@ function love.load()
   love.graphics.setFont(assets.get_font('Cuneiform36'))
   love.audio.play(assets.get_source('intro'))
 
-  render.activate_map('test_map_1')
+  render.activate_map('side_scroll')
   player = assets.get_object('Player')
   player_module.init_controls(player, render.map.active_map)
 end

diff --git a/main/tiled/side_scroll.lua b/main/tiled/side_scroll.lua
index 063ae60f8ae5c1dec26123fd7ae37e3c370164b3..815518a936a4007d981928552e3b9343278f33bf 100644 (file)
--- a/main/tiled/side_scroll.lua
+++ b/main/tiled/side_scroll.lua
@@ -230,12 +230,12 @@ return {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 209, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 209, 0, 0, 0, 0, 0, 0, 0, 0, 0, 209, 0, 0, 0,
-        0, 0, 0, 0, 205, 0, 209, 0, 0, 0, 0, 0, 0, 0, 209, 0, 205, 0, 209, 0, 0, 0, 0, 0, 0, 0, 3221225677, 0, 0, 0,
-        0, 0, 0, 0, 207, 2684354765, 1610612943, 2684354765, 1610612943, 2684354765, 2684354765, 2684354765, 1610612943, 2684354765, 1610612943, 2684354765, 1610612943, 2684354765, 1610612943, 2684354765, 1610612943, 2684354765, 2684354765, 2684354765, 1610612943, 2684354765, 3221225679, 0, 0, 0,
-        0, 0, 0, 0, 205, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3221225677, 0, 0, 0,
-        0, 0, 0, 0, 205, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 256, 2684354815, 2684354816, 1, 1, 1, 1, 1, 1, 1, 1, 3221225677, 0, 0, 0,
-        0, 0, 0, 0, 205, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 255, 254, 3221225727, 1, 1, 1, 1, 1, 1, 1, 1, 3221225677, 0, 0, 0
+        0, 0, 0, 0, 1287, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1287, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1287, 0, 0, 0,
+        0, 0, 0, 0, 1283, 0, 1287, 0, 0, 0, 0, 0, 0, 0, 1287, 0, 1283, 0, 1287, 0, 0, 0, 0, 0, 0, 0, 3221226755, 0, 0, 0,
+        0, 0, 0, 0, 1285, 2684355843, 1610614021, 2684355843, 1610614021, 2684355843, 2684355843, 2684355843, 1610614021, 2684355843, 1610614021, 2684355843, 1610614021, 2684355843, 1610614021, 2684355843, 1610614021, 2684355843, 2684355843, 2684355843, 1610614021, 2684355843, 3221226757, 0, 0, 0,
+        0, 0, 0, 0, 1283, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3221226755, 0, 0, 0,
+        0, 0, 0, 0, 1283, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 256, 2684354815, 2684354816, 1, 1, 1, 1, 1, 1, 1, 1, 3221226755, 0, 0, 0,
+        0, 0, 0, 0, 1283, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 255, 254, 3221225727, 1, 1, 1, 1, 1, 1, 1, 1, 3221226755, 0, 0, 0
       }
     }
   }

diff --git a/main/tiled/side_scroll.tmx b/main/tiled/side_scroll.tmx
index 2fb186173b224ba4d748b78eb093b4f6294e95d7..a19bb99a1f2cf6fb39b2da098e6e332a1f52c424 100644 (file)
--- a/main/tiled/side_scroll.tmx
+++ b/main/tiled/side_scroll.tmx
@@ -82,12 +82,12 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,209,0,0,0,0,0,0,0,0,0,0,0,209,0,0,0,0,0,0,0,0,0,209,0,0,0,
-0,0,0,0,205,0,209,0,0,0,0,0,0,0,209,0,205,0,209,0,0,0,0,0,0,0,3221225677,0,0,0,
-0,0,0,0,207,2684354765,1610612943,2684354765,1610612943,2684354765,2684354765,2684354765,1610612943,2684354765,1610612943,2684354765,1610612943,2684354765,1610612943,2684354765,1610612943,2684354765,2684354765,2684354765,1610612943,2684354765,3221225679,0,0,0,
-0,0,0,0,205,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3221225677,0,0,0,
-0,0,0,0,205,1,1,1,1,1,1,1,1,1,1,256,2684354815,2684354816,1,1,1,1,1,1,1,1,3221225677,0,0,0,
-0,0,0,0,205,1,1,1,1,1,1,1,1,1,1,255,254,3221225727,1,1,1,1,1,1,1,1,3221225677,0,0,0
+0,0,0,0,1287,0,0,0,0,0,0,0,0,0,0,0,1287,0,0,0,0,0,0,0,0,0,1287,0,0,0,
+0,0,0,0,1283,0,1287,0,0,0,0,0,0,0,1287,0,1283,0,1287,0,0,0,0,0,0,0,3221226755,0,0,0,
+0,0,0,0,1285,2684355843,1610614021,2684355843,1610614021,2684355843,2684355843,2684355843,1610614021,2684355843,1610614021,2684355843,1610614021,2684355843,1610614021,2684355843,1610614021,2684355843,2684355843,2684355843,1610614021,2684355843,3221226757,0,0,0,
+0,0,0,0,1283,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3221226755,0,0,0,
+0,0,0,0,1283,1,1,1,1,1,1,1,1,1,1,256,2684354815,2684354816,1,1,1,1,1,1,1,1,3221226755,0,0,0,
+0,0,0,0,1283,1,1,1,1,1,1,1,1,1,1,255,254,3221225727,1,1,1,1,1,1,1,1,3221226755,0,0,0
 </data>
  </layer>
 </map>