Add preliminary support for multiple layers in ortho maps

2 files changed, 18 insertions, 15 deletions

diff --git a/include/isogfx/asset.h b/include/isogfx/asset.h
index cc70ee3..74063a8 100644
--- a/include/isogfx/asset.h
+++ b/include/isogfx/asset.h
@@ -10,6 +10,7 @@
 #include <isogfx/types.h>
 
 #include <assert.h>
+#include <stddef.h>
 #include <stdint.h>
 
 // Maximum length of path strings in .TS and .TM files.
@@ -177,9 +178,10 @@ static inline const Tm_Layer* tm_map_get_layer(
   assert(map);
   assert(layer >= 0);
   assert(layer < map->num_layers);
-  return (const Tm_Layer*)((const uint8_t*)map->layers +
-                           (layer * map->world_width * map->world_height *
-                            sizeof(Tile)));
+  return (
+      const Tm_Layer*)((const uint8_t*)map->layers +
+                       ((size_t)(layer * map->world_width * map->world_height) *
+                        sizeof(Tile)));
 }
 
 /// Return the ith layer in the tile map.
diff --git a/src/gfx2d.c b/src/gfx2d.c
index e79dd3e..14e0539 100644
--- a/src/gfx2d.c
+++ b/src/gfx2d.c
@@ -651,18 +651,19 @@ static void draw_map_ortho(Gfx2d* gfx) {
   assert(gfx);
   assert(gfx->map);
 
-  // TODO: Handle multiple layers.
-  const Tm_Layer* layer = tm_map_get_layer(gfx->map, 0);
-
-  // TODO: This currently renders with tile granularity. Do so instead in terms
-  //  of pixels for more accurate camera panning. The camera coordinates are
-  //  already given in pixels.
-  for (int wy = gfx->camera.y / gfx->map->base_tile_height;
-       wy < gfx->map->world_height; ++wy) {
-    for (int wx = gfx->camera.x / gfx->map->base_tile_width;
-         wx < gfx->map->world_width; ++wx) {
-      const Tile tile = tm_layer_get_tile(gfx->map, layer, wx, wy);
-      draw_tile_ortho(gfx, tile, wx, wy);
+  for (uint16_t l = 0; l < gfx->map->num_layers; ++l) {
+    const Tm_Layer* layer = tm_map_get_layer(gfx->map, l);
+
+    // TODO: This currently renders with tile granularity. Do so instead in
+    //  terms of pixels for more accurate camera panning. The camera coordinates
+    //  are already given in pixels.
+    for (int wy = gfx->camera.y / gfx->map->base_tile_height;
+         wy < gfx->map->world_height; ++wy) {
+      for (int wx = gfx->camera.x / gfx->map->base_tile_width;
+           wx < gfx->map->world_width; ++wx) {
+        const Tile tile = tm_layer_get_tile(gfx->map, layer, wx, wy);
+        draw_tile_ortho(gfx, tile, wx, wy);
+      }
     }
   }
 }