summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--editor/tile-editor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/tile-editor.cpp b/editor/tile-editor.cpp
index d89a291d..9f9b6571 100644
--- a/editor/tile-editor.cpp
+++ b/editor/tile-editor.cpp
@@ -6,7 +6,7 @@
#include "random.hpp"
#include "serialize/json-helper.hpp"
#include "serialize/tile-atlas.hpp"
-#include <Corrade/Containers/Pair.h>
+#include <Corrade/Containers/PairStl.h>
#include <Corrade/Utility/Path.h>
namespace floormat {
@@ -22,7 +22,7 @@ void tile_editor::load_atlases()
const auto filename = _name + ".json";
for (auto& atlas : json_helper::from_json<atlas_array>(Path::join(loader_::IMAGE_PATH, filename)))
{
- const StringView name = Path::splitExtension(atlas->name()).first();
+ const auto [name, _ext] = Path::splitExtension(atlas->name());
auto& [_, vec] = _permutation;
vec.reserve(atlas->num_tiles());
_atlases[name] = atlas;