diff options
Diffstat (limited to 'loader/scenery-cell.cpp')
| -rw-r--r-- | loader/scenery-cell.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/loader/scenery-cell.cpp b/loader/scenery-cell.cpp index 96b256cb..d8b0f885 100644 --- a/loader/scenery-cell.cpp +++ b/loader/scenery-cell.cpp @@ -1,18 +1,18 @@ #include "scenery-cell.hpp" -#include "compat/vector-wrapper.hpp" #include "src/anim-atlas.hpp" #include "loader/loader.hpp" #include "serialize/json-helper.hpp" #include "serialize/scenery.hpp" #include "serialize/json-wrapper.hpp" +#include "serialize/corrade-array.hpp" namespace floormat { -vector_wrapper<const scenery_cell> scenery_cell::load_atlases_from_json() +Array<scenery_cell> scenery_cell::load_atlases_from_json() { char buf[fm_FILENAME_MAX]; auto path = loader.make_atlas_path(buf, loader.SCENERY_PATH, "scenery.json"_s); - return { json_helper::from_json<std::vector<scenery_cell>>(path) }; + return json_helper::from_json<Array<scenery_cell>>(path); } } // namespace floormat |