From 0ce27b41cc735b02f42fe4a67dbe8ee2f4fd2ffc Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 15 Apr 2023 01:35:24 +0200 Subject: editor: cleanup hardcoded seed tile --- editor/update.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'editor/update.cpp') diff --git a/editor/update.cpp b/editor/update.cpp index d5eb2039..64090973 100644 --- a/editor/update.cpp +++ b/editor/update.cpp @@ -8,6 +8,7 @@ #include "src/character.hpp" #include "src/tile-iterator.hpp" #include "keys.hpp" +#include "loader/loader.hpp" #include namespace floormat { @@ -16,12 +17,20 @@ namespace floormat { void app::maybe_initialize_chunk_(const chunk_coords_& pos, chunk& c) { + auto floor1 = loader.tile_atlas("floor-tiles", {44, 4}, pass_mode::pass); + auto floor2 = loader.tile_atlas("metal1", {2, 2}, pass_mode::pass); + auto wall1 = loader.tile_atlas("wood2", {2, 1}, pass_mode::blocked); + auto wall2 = loader.tile_atlas("wood1", {2, 1}, pass_mode::blocked); + auto door = loader.anim_atlas("door-close", loader.SCENERY_PATH); + auto table = loader.anim_atlas("table", loader.SCENERY_PATH); + auto control_panel = loader.anim_atlas("control-panel", loader.SCENERY_PATH); + (void)pos; (void)c; [[maybe_unused]] constexpr auto N = TILE_MAX_DIM; for (auto [x, k, pt] : c) { #if 1 - const auto& atlas = _floor1; + const auto& atlas = floor1; #else const auto& atlas = pt.x == N/2 || pt.y == N/2 ? _floor2 : _floor1; #endif -- cgit v1.2.3