From 98ecfdd1ad673cf15af702cae7176ce653fee086 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 28 Nov 2022 16:15:53 +0100 Subject: move scenery to its own directory --- serialize/scenery.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'serialize') 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 #include -#include #include namespace { @@ -106,7 +103,7 @@ void adl_serializer::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 = {}; -- cgit v1.2.3