diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-28 16:15:53 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-28 16:20:08 +0100 |
commit | 98ecfdd1ad673cf15af702cae7176ce653fee086 (patch) | |
tree | 3832c827cb8828006dd16fdafe66b4cb20eb19fc /serialize/scenery.cpp | |
parent | 403325634d3226f490fd843b93b1688edf6f032d (diff) |
move scenery to its own directory
Diffstat (limited to 'serialize/scenery.cpp')
-rw-r--r-- | serialize/scenery.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/serialize/scenery.cpp b/serialize/scenery.cpp index 0089e411..e12df693 100644 --- a/serialize/scenery.cpp +++ b/serialize/scenery.cpp @@ -3,10 +3,7 @@ #include "compat/assert.hpp" #include "loader/loader.hpp" #include "serialize/corrade-string.hpp" -#include "serialize/json-helper.hpp" -#include <array> #include <Corrade/Containers/StringStlView.h> -#include <Corrade/Utility/Path.h> #include <nlohmann/json.hpp> namespace { @@ -106,7 +103,7 @@ void adl_serializer<scenery_proto>::from_json(const json& j, scenery_proto& val) StringView atlas_name = j["atlas-name"]; fm_assert(!atlas_name.isEmpty()); - auto atlas = loader.anim_atlas(Path::join("scenery", atlas_name)); + auto atlas = loader.anim_atlas(atlas_name, loader_::SCENERY_PATH); auto& f = val.frame; f = {}; |