3 files changed, 36 insertions, 9 deletions
diff --git a/serialize/json-wrapper.hpp b/serialize/json-wrapper.hpp
new file mode 100644
index 00000000..722fa8b7
--- /dev/null
+++ b/serialize/json-wrapper.hpp
@@ -0,0 +1,9 @@
+#pragma once
+#include "loader/scenery-cell.hpp"
+#include <nlohmann/json.hpp>
+
+namespace floormat {
+
+struct json_wrapper { nlohmann::json j; };
+
+} // namespace floormat
diff --git a/serialize/old-savegame.cpp b/serialize/old-savegame.cpp
index 14313f5b..bee5662d 100644
--- a/serialize/old-savegame.cpp
+++ b/serialize/old-savegame.cpp
@@ -198,8 +198,6 @@ bool read_object_flags(binary_reader<T>& s, U& e)
 
 void reader_state::read_sceneries(reader_t& s)
 {
-    (void)loader.sceneries();
-
     uint16_t magic; magic << s;
     if (magic != scenery_magic)
         fm_throw("bad scenery magic"_cf);
@@ -213,7 +211,7 @@ void reader_state::read_sceneries(reader_t& s)
         uint8_t num; num << s;
         fm_soft_assert(num > 0);
         auto str = s.read_asciiz_string<atlas_name_max>();
-        auto sc = loader.scenery(str);
+        auto sc = loader.scenery(str, asset_policy);
         for (auto n = 0uz; n < num; n++)
         {
             atlasid id; id << s;
diff --git a/serialize/scenery.cpp b/serialize/scenery.cpp
index 8935ee3d..ff20d3d3 100644
--- a/serialize/scenery.cpp
+++ b/serialize/scenery.cpp
@@ -7,9 +7,27 @@
 #include "loader/scenery-cell.hpp"
 #include "serialize/pass-mode.hpp"
 #include "serialize/magnum-vector.hpp"
+#include "json-wrapper.hpp"
 #include <Corrade/Containers/String.h>
 #include <nlohmann/json.hpp>
 
+namespace floormat {
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-copy-with-user-provided-dtor"
+#endif
+
+scenery_cell::~scenery_cell() noexcept = default;
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+auto scenery_cell::make_json_wrapper() -> json_wrapper* { return new json_wrapper; }
+
+} // namespace floormat
+
 namespace {
 
 using namespace floormat;
@@ -184,17 +202,19 @@ void adl_serializer<scenery_proto>::from_json(const json& j, scenery_proto& f)
 
 void adl_serializer<scenery_cell>::to_json(json& j, const scenery_cell& val)
 {
-    fm_soft_assert(val.proto.atlas);
-    j = val.proto;
-    const auto name = !val.name.isEmpty() ? StringView{val.name} : val.proto.atlas->name();
-    j["name"] = name;
+    j = val.data->j;
+    fm_assert(val.name);
+    j["name"] = val.name;
 }
 
 void adl_serializer<scenery_cell>::from_json(const json& j, scenery_cell& val)
 {
     val = {};
-    val.proto = j;
-    val.name = j["name"];
+    val.data->j = j;
+    if (j.contains("name"))
+        val.name = j["name"];
+    else
+        val.name = j["atlas-name"];
 }
 
 } // namespace nlohmann