5 files changed, 10 insertions, 10 deletions
diff --git a/editor/app.hpp b/editor/app.hpp
index ff5326ac..f7adfc9a 100644
--- a/editor/app.hpp
+++ b/editor/app.hpp
@@ -67,8 +67,6 @@ private:
         MAX = quit, COUNT
     };
 
-    void make_test_chunk(chunk& c);
-
     void do_mouse_click(global_coords pos, int button);
     void do_mouse_release(int button);
     void do_mouse_move(global_coords pos);
@@ -80,11 +78,14 @@ private:
 
     void draw_ui();
     float draw_main_menu();
-    void draw_editor_pane(tile_editor& type, float main_menu_height);
     void draw_fps();
-    void draw_cursor_tile();
+    void draw_cursor_tile_coord();
     void render_menu();
 
+    void draw_editor_pane(tile_editor& type, float main_menu_height);
+
+    void draw_cursor_tile();
+
     void draw_wireframe_quad(global_coords pt);
     void draw_wireframe_box(global_coords pt);
 
diff --git a/editor/draw.cpp b/editor/draw.cpp
index fe12489d..7f71fcf9 100644
--- a/editor/draw.cpp
+++ b/editor/draw.cpp
@@ -1,4 +1,3 @@
-#if 0
 #include "app.hpp"
 #include "main/floormat-main.hpp"
 #include "shaders/tile-shader.hpp"
@@ -50,4 +49,3 @@ void app::draw()
 
 } // namespace floormat
 
-#endif
diff --git a/editor/imgui.cpp b/editor/imgui.cpp
index 571c1c1b..d94146b7 100644
--- a/editor/imgui.cpp
+++ b/editor/imgui.cpp
@@ -211,7 +211,7 @@ void app::draw_fps()
     }
 }
 
-void app::draw_cursor_tile()
+void app::draw_cursor_tile_coord()
 {
     if (!cursor.tile)
         return;
diff --git a/editor/update.cpp b/editor/update.cpp
index d93c34e2..a38f4e6e 100644
--- a/editor/update.cpp
+++ b/editor/update.cpp
@@ -1,6 +1,5 @@
 #include "app.hpp"
 #include "src/chunk.hpp"
-#include "src/tile-atlas.hpp"
 #include "main/floormat-events.hpp"
 #include "main/floormat-main.hpp"
 #include <Magnum/Platform/Sdl2Application.h>
@@ -9,8 +8,10 @@ namespace floormat {
 
 //#define FM_NO_BINDINGS
 
-void app::make_test_chunk(chunk& c)
+void app::maybe_init_chunk(const chunk_coords& pos, chunk& c)
 {
+    (void)pos;
+
     constexpr auto N = TILE_MAX_DIM;
     for (auto [x, k, pt] : c) {
 #if defined FM_NO_BINDINGS
diff --git a/main/floormat-main.hpp b/main/floormat-main.hpp
index 66efeeec..69b2bf34 100644
--- a/main/floormat-main.hpp
+++ b/main/floormat-main.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "floormat.hpp"
 #include "src/global-coords.hpp"
 #include <Magnum/Math/Vector2.h>
 
@@ -8,6 +7,7 @@ struct SDL_Window;
 
 namespace floormat {
 
+struct fm_settings;
 struct floormat_app;
 struct tile_shader;
 struct world;