diff options
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/imgui-editors.cpp | 2 | ||||
| -rw-r--r-- | editor/update.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/editor/imgui-editors.cpp b/editor/imgui-editors.cpp index 2712dc5f..595d6c77 100644 --- a/editor/imgui-editors.cpp +++ b/editor/imgui-editors.cpp @@ -268,7 +268,7 @@ void app::draw_editor_pane(float main_menu_height) { if (ed) for (const auto& [k, v] : *ed) - draw_editor_tile_pane_atlas(*ed, k, v, dpi); + draw_editor_tile_pane_atlas(*ed, k, v->atlas, dpi); else if (sc) impl_draw_editor_scenery_pane<scenery_editor>(*sc, dpi); else if (vo) diff --git a/editor/update.cpp b/editor/update.cpp index 6ecffc80..3d22c37c 100644 --- a/editor/update.cpp +++ b/editor/update.cpp @@ -17,10 +17,10 @@ namespace floormat { void app::maybe_initialize_chunk_(const chunk_coords_& pos, chunk& c) { - auto floor1 = loader.ground_atlas("ground-tiles", { 44, 4 }, pass_mode::pass); - auto floor2 = loader.ground_atlas("metal1", { 2, 2 }, pass_mode::pass); - auto wall1 = loader.ground_atlas("wood2", { 2, 1 }, pass_mode::blocked); - auto wall2 = loader.ground_atlas("wood1", { 2, 1 }, pass_mode::blocked); + auto floor1 = loader.ground_atlas("ground-tiles"); + auto floor2 = loader.ground_atlas("metal1"); + auto wall1 = loader.ground_atlas("wood2"); + auto wall2 = loader.ground_atlas("wood1"); 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); |