diff options
Diffstat (limited to 'loader/ground-cell.cpp')
| -rw-r--r-- | loader/ground-cell.cpp | 6 |
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 |