summaryrefslogtreecommitdiffhomepage
path: root/loader/ground-cell.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2024-02-14 19:40:18 +0100
committerStanislaw Halik <sthalik@misaki.pl>2024-02-14 19:40:18 +0100
commit07018b1d1247f4fb558a2b551dd8d4ca35346377 (patch)
tree51ee528771fbb77ee1f62adf38a1d8cca1c8ac8c /loader/ground-cell.cpp
parent626e49662839a1ecd505547a5671d1ab8ac5b4aa (diff)
switch back to using StringView in atlas loader
Diffstat (limited to 'loader/ground-cell.cpp')
-rw-r--r--loader/ground-cell.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/loader/ground-cell.cpp b/loader/ground-cell.cpp
index f8373d76..82829b62 100644
--- a/loader/ground-cell.cpp
+++ b/loader/ground-cell.cpp
@@ -4,14 +4,16 @@
#include "serialize/json-helper.hpp"
//#include "serialize/corrade-string.hpp"
#include "serialize/ground-atlas.hpp"
+#include "serialize/corrade-array.hpp"
+#include <cr/Array.h>
namespace floormat {
-vector_wrapper<const ground_cell> ground_cell::load_atlases_from_json()
+Array<ground_cell> ground_cell::load_atlases_from_json()
{
char buf[fm_FILENAME_MAX];
auto s = loader.make_atlas_path(buf, loader.GROUND_TILESET_PATH, "ground.json"_s);
- return {json_helper::from_json<std::vector<ground_cell>>(s)};
+ return json_helper::from_json<Array<ground_cell>>(s);
}
} // namespace floormat