diff options
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/app.hpp | 1 | ||||
| -rw-r--r-- | editor/tile-editor.cpp | 3 | ||||
| -rw-r--r-- | editor/tile-editor.hpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/editor/app.hpp b/editor/app.hpp index d784fe9a..63fcd6ae 100644 --- a/editor/app.hpp +++ b/editor/app.hpp @@ -2,7 +2,6 @@ #include "compat/defs.hpp" #include "compat/enum-bitset.hpp" #include "editor.hpp" -#include "src/global-coords.hpp" #include "draw/wireframe.hpp" #include "draw/quad-floor.hpp" #include "draw/quad-wall-n.hpp" diff --git a/editor/tile-editor.cpp b/editor/tile-editor.cpp index 66ca1e7b..965245a9 100644 --- a/editor/tile-editor.cpp +++ b/editor/tile-editor.cpp @@ -6,6 +6,7 @@ #include "random.hpp" #include "serialize/json-helper.hpp" #include "serialize/tile-atlas.hpp" +#include <Corrade/Containers/StringStl.h> namespace floormat { @@ -50,6 +51,8 @@ std::shared_ptr<tile_atlas> tile_editor::atlas(StringView str) fm_abort("no such atlas: %s", str.cbegin()); } +StringView tile_editor::name() const noexcept { return _name; } + void tile_editor::clear_selection() { _selected_tile = {}; diff --git a/editor/tile-editor.hpp b/editor/tile-editor.hpp index df33c761..53b12e55 100644 --- a/editor/tile-editor.hpp +++ b/editor/tile-editor.hpp @@ -44,7 +44,7 @@ public: auto cend() const noexcept { return _atlases.cend(); } auto begin() const noexcept { return _atlases.cbegin(); } auto end() const noexcept { return _atlases.cend(); } - StringView name() const noexcept { return _name; } + StringView name() const noexcept; editor_mode mode() const noexcept { return _mode; } editor_wall_rotation rotation() const noexcept { return _rotation; } |