switch back to using StringView in atlas loader

1 files changed, 4 insertions, 3 deletions

diff --git a/loader/wall-cell.cpp b/loader/wall-cell.cpp
index 4e12f0be..8870b891 100644
--- a/loader/wall-cell.cpp
+++ b/loader/wall-cell.cpp
@@ -1,9 +1,10 @@
 #include "wall-cell.hpp"
-#include "compat/vector-wrapper.hpp"
 #include "compat/exception.hpp"
 #include "serialize/json-helper.hpp"
 #include "serialize/corrade-string.hpp"
+#include "serialize/corrade-array.hpp"
 #include "loader/loader.hpp"
+#include <cr/Array.h>
 
 namespace floormat {
 
@@ -20,11 +21,11 @@ using nlohmann::json;
     j["name"] = val.name;
 }
 
-vector_wrapper<const wall_cell> wall_cell::load_atlases_from_json()
+Array<wall_cell> wall_cell::load_atlases_from_json()
 {
     char buf[fm_FILENAME_MAX];
     auto s = loader.make_atlas_path(buf, loader.WALL_TILESET_PATH, "walls.json"_s);
-    return {json_helper::from_json<std::vector<wall_cell>>(s)};
+    return {json_helper::from_json<Array<wall_cell>>(s)};
 }
 
 } // namespace floormat