summaryrefslogtreecommitdiffhomepage
path: root/loader/atlas.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2022-11-28 16:15:53 +0100
committerStanislaw Halik <sthalik@misaki.pl>2022-11-28 16:20:08 +0100
commit98ecfdd1ad673cf15af702cae7176ce653fee086 (patch)
tree3832c827cb8828006dd16fdafe66b4cb20eb19fc /loader/atlas.cpp
parent403325634d3226f490fd843b93b1688edf6f032d (diff)
move scenery to its own directory
Diffstat (limited to 'loader/atlas.cpp')
-rw-r--r--loader/atlas.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/loader/atlas.cpp b/loader/atlas.cpp
index f68ca820..584d6b5a 100644
--- a/loader/atlas.cpp
+++ b/loader/atlas.cpp
@@ -29,7 +29,7 @@ ArrayView<String> loader_impl::anim_atlas_list()
return anim_atlases;
}
-std::shared_ptr<anim_atlas> loader_impl::anim_atlas(StringView name)
+std::shared_ptr<anim_atlas> loader_impl::anim_atlas(StringView name, StringView dir)
{
fm_assert(check_atlas_name(name));
@@ -37,7 +37,7 @@ std::shared_ptr<anim_atlas> loader_impl::anim_atlas(StringView name)
return it->second;
else
{
- const auto path = Path::join(ANIM_PATH, Path::splitExtension(name).first());
+ const auto path = Path::join(dir, Path::splitExtension(name).first());
auto anim_info = deserialize_anim(path + ".json");
for (anim_group& group : anim_info.groups)