summaryrefslogtreecommitdiffhomepage
path: root/serialize/tile.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2022-10-22 16:03:10 +0200
committerStanislaw Halik <sthalik@misaki.pl>2022-10-22 16:03:10 +0200
commitb1165d784c446dc505a100d861cb5151bebdda15 (patch)
tree0186179580aa8585f6fb3f3ad9c0ca7207f97607 /serialize/tile.cpp
parentaa03952cb2a889f8d81a70ed4bd0b4ae69e5ab8d (diff)
serializer work
Diffstat (limited to 'serialize/tile.cpp')
-rw-r--r--serialize/tile.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/serialize/tile.cpp b/serialize/tile.cpp
index 2e94bfb8..11473548 100644
--- a/serialize/tile.cpp
+++ b/serialize/tile.cpp
@@ -12,10 +12,10 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(local_coords, x, y)
} // namespace floormat
-namespace nlohmann {
-
using namespace floormat;
+namespace nlohmann {
+
void adl_serializer<tile_image>::to_json(json& j, const tile_image& val) { using nlohmann::to_json; if (val.atlas) to_json(j, val); else j = nullptr; }
void adl_serializer<tile_image>::from_json(const json& j, tile_image& val) { using nlohmann::from_json; from_json(j, val); }