From 3c995acde81feae6c46a14fe7abbc6d2b434422b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 24 Sep 2014 03:20:25 +0200 Subject: Support multiple map layers, fix transparent tiles --- src/model/Map.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/model/Map.cpp') diff --git a/src/model/Map.cpp b/src/model/Map.cpp index db18baf..a770ee4 100644 --- a/src/model/Map.cpp +++ b/src/model/Map.cpp @@ -35,13 +35,22 @@ std::shared_ptr Map::load(__attribute__((unused)) const std::string &name) std::shared_ptr map(new Map(16, 16)); map->tileset.push_back("dirt"); + map->tileset.push_back("horizontal_bar"); + + for (int i = 0; i < 2; i++) + map->tiles.emplace_back(new uint32_t[16*16]); for (int i = 0; i < 16; i++) { for (int j = 0; j < 16; j++) { if (4 <= i && i < 12 && 4 <= j && j < 12) - map->setTileAt(i, j, 1); + map->setTileAt(0, i, j, 1); + else + map->setTileAt(0, i, j, 0); + + if (4 <= i && i < 12 && j == 8) + map->setTileAt(1, i, j, 2); else - map->setTileAt(i, j, 0); + map->setTileAt(1, i, j, 0); } } -- cgit v1.2.3