serializer work

1 files changed, 6 insertions, 10 deletions

diff --git a/serialize/tile-atlas.cpp b/serialize/tile-atlas.cpp
index 4c80a212..d5350851 100644
--- a/serialize/tile-atlas.cpp
+++ b/serialize/tile-atlas.cpp
@@ -2,29 +2,25 @@
 #include "serialize/tile-atlas.hpp"
 #include "serialize/magnum-vector2i.hpp"
 #include "loader.hpp"
+#include "compat/assert.hpp"
 #include <tuple>
 
 #include <nlohmann/json.hpp>
 
-using namespace Magnum;
 using namespace floormat;
 
 namespace nlohmann {
 
 using proxy_atlas = std::tuple<std::string, Vector2ub>;
-using shared_atlas = std::shared_ptr<floormat::tile_atlas>;
 
-void adl_serializer<shared_atlas>::to_json(json& j, const shared_atlas& x)
+void adl_serializer<std::shared_ptr<tile_atlas>>::to_json(json& j, const std::shared_ptr<const tile_atlas>& x)
 {
-    if (!x)
-        j = nullptr;
-    else {
-        using nlohmann::to_json;
-        to_json(j, proxy_atlas{x->name(), x->num_tiles2()});
-    }
+    fm_assert(x);
+    using nlohmann::to_json;
+    to_json(j, proxy_atlas{x->name(), x->num_tiles2()});
 }
 
-void adl_serializer<shared_atlas>::from_json(const json& j, shared_atlas& x)
+void adl_serializer<std::shared_ptr<tile_atlas>>::from_json(const json& j, std::shared_ptr<tile_atlas>& x)
 {
     proxy_atlas proxy = j;
     const auto& [name, num_tiles] = proxy;