summaryrefslogtreecommitdiffhomepage
path: root/serialize
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2022-11-28 15:26:02 +0100
committerStanislaw Halik <sthalik@misaki.pl>2022-11-28 15:26:02 +0100
commit999f1bb049553207a89a998b48d9e214f255b108 (patch)
treef19e9f9f53eff02026ddb9bda11aedcf77074220 /serialize
parent1b6897ef91e7a82319a295d5f30a796bdc3a6db1 (diff)
scenery wip
Diffstat (limited to 'serialize')
-rw-r--r--serialize/scenery.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/serialize/scenery.cpp b/serialize/scenery.cpp
index 984b11bc..64fc7d7b 100644
--- a/serialize/scenery.cpp
+++ b/serialize/scenery.cpp
@@ -6,6 +6,7 @@
#include "serialize/json-helper.hpp"
#include <array>
#include <Corrade/Containers/StringStlView.h>
+#include <Corrade/Utility/Path.h>
#include <nlohmann/json.hpp>
namespace {
@@ -105,7 +106,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(atlas_name);
+ auto atlas = loader.anim_atlas(Path::join("scenery", atlas_name));
auto& f = val.frame;
f = {};