4 files changed, 27 insertions, 35 deletions
diff --git a/serialize/anim.hpp b/serialize/anim.hpp
index 726efa44..3b5504f8 100644
--- a/serialize/anim.hpp
+++ b/serialize/anim.hpp
@@ -4,9 +4,9 @@
 #include <array>
 #include <vector>
 #include <string>
-
 #include <Magnum/Magnum.h>
 #include <Magnum/Math/Vector2.h>
+#include <nlohmann/json_fwd.hpp>
 
 namespace std::filesystem { class path; }
 
@@ -45,3 +45,8 @@ struct anim final
 
 } // namespace Magnum::Examples::Serialize
 
+namespace nlohmann {
+
+
+
+} // namespace nlohmann
diff --git a/serialize/json-helper.hpp b/serialize/json-helper.hpp
index 86c6a16f..6be7f74c 100644
--- a/serialize/json-helper.hpp
+++ b/serialize/json-helper.hpp
@@ -18,7 +18,6 @@ struct json_helper final {
 
 template<typename t>
 std::tuple<t, bool> json_helper::from_json(const std::filesystem::path& pathname) {
-    using namespace nlohmann;
     using Corrade::Utility::Error;
     std::ifstream s;
     s.exceptions(s.exceptions() | std::ios::failbit | std::ios::badbit);
@@ -29,10 +28,9 @@ std::tuple<t, bool> json_helper::from_json(const std::filesystem::path& pathname
         return {};
     }
     t ret;
-    json j;
+    nlohmann::json j;
     s >> j;
-    using nlohmann::from_json;
-    from_json(j, ret);
+    ret = j;
     return { std::move(ret), true };
 }
 
diff --git a/serialize/tile.cpp b/serialize/tile.cpp
index 2f414e62..df49a465 100644
--- a/serialize/tile.cpp
+++ b/serialize/tile.cpp
@@ -9,6 +9,7 @@ namespace Magnum::Examples {
 
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(tile_image, atlas, variant)
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(tile, ground_image, wall_north, wall_west, passability)
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(local_coords, x, y)
 
 } // namespace Magnum::Examples
 
@@ -16,35 +17,16 @@ namespace nlohmann {
 
 using namespace Magnum::Examples;
 
-void adl_serializer<tile_image>::to_json(json& j, const tile_image& val) {
-    using nlohmann::to_json;
-    to_json(j, val);
-}
-
-void adl_serializer<tile_image>::from_json(const json& j, tile_image& val) {
-    using nlohmann::from_json;
-    from_json(j, val);
-}
-
-void adl_serializer<tile>::to_json(json& j, const tile& val) {
-    using nlohmann::to_json;
-    to_json(j, val);
-}
-
-void adl_serializer<tile>::from_json(const json& j, tile& val) {
-    using nlohmann::from_json;
-    from_json(j, val);
-}
-
-void adl_serializer<chunk>::to_json(json& j, const chunk& val) {
-    using nlohmann::to_json;
-    to_json(j, val.tiles());
-}
-
-void adl_serializer<chunk>::from_json(const json& j, chunk& val) {
-    using nlohmann::from_json;
-    std::remove_cvref_t<decltype(val.tiles())> tiles = {};
-    tiles = j;
-}
+void adl_serializer<tile_image>::to_json(json& j, const tile_image& val) { j = val; }
+void adl_serializer<tile_image>::from_json(const json& j, tile_image& val) { val = j; }
+
+void adl_serializer<tile>::to_json(json& j, const tile& val) { j = val; }
+void adl_serializer<tile>::from_json(const json& j, tile& val) { val = j; }
+
+void adl_serializer<chunk>::to_json(json& j, const chunk& val) { j = val.tiles(); }
+void adl_serializer<chunk>::from_json(const json& j, chunk& val) { val.tiles() = j; }
+
+void adl_serializer<local_coords>::to_json(json& j, const local_coords& val) { j = val; }
+void adl_serializer<local_coords>::from_json(const json& j, local_coords& val) { val = j; }
 
 } // namespace nlohmann
diff --git a/serialize/tile.hpp b/serialize/tile.hpp
index d0a2d144..f84ebd8d 100644
--- a/serialize/tile.hpp
+++ b/serialize/tile.hpp
@@ -5,6 +5,7 @@ namespace Magnum::Examples {
 struct tile_image;
 struct tile;
 struct chunk;
+struct local_coords;
 } // namespace Magnum::Examples
 
 namespace nlohmann {
@@ -27,4 +28,10 @@ struct adl_serializer<Magnum::Examples::chunk> {
     static void from_json(const json& j, Magnum::Examples::chunk& val);
 };
 
+template<>
+struct adl_serializer<Magnum::Examples::local_coords> {
+    static void to_json(json& j, const Magnum::Examples::local_coords& val);
+    static void from_json(const json& j, Magnum::Examples::local_coords& val);
+};
+
 } // namespace nlohmann