summaryrefslogtreecommitdiffhomepage
path: root/serialize
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2023-04-16 12:26:07 +0200
committerStanislaw Halik <sthalik@misaki.pl>2023-04-16 13:44:15 +0200
commit7cb658cc15a18634dd8733954134ad8289da1731 (patch)
tree2e816c55813ebf1940f38360a82108ef3b78a24e /serialize
parent5e9a9fef6edb636b7e6babb743541a18f25bd67f (diff)
mess around with <memory> inclusion
Diffstat (limited to 'serialize')
-rw-r--r--serialize/tile-atlas.hpp3
-rw-r--r--serialize/world-reader.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/serialize/tile-atlas.hpp b/serialize/tile-atlas.hpp
index 02e5b966..0c65c55e 100644
--- a/serialize/tile-atlas.hpp
+++ b/serialize/tile-atlas.hpp
@@ -1,9 +1,8 @@
#pragma once
+#include "src/tile-atlas.hpp"
#include <memory>
#include <nlohmann/json_fwd.hpp>
-namespace floormat { struct tile_atlas; }
-
namespace nlohmann {
template<>
diff --git a/serialize/world-reader.cpp b/serialize/world-reader.cpp
index 09566afa..f72065ef 100644
--- a/serialize/world-reader.cpp
+++ b/serialize/world-reader.cpp
@@ -9,8 +9,8 @@
#include "src/tile-atlas.hpp"
#include "src/anim-atlas.hpp"
#include "src/chunk-scenery.hpp"
-
#include <cstring>
+#include <memory>
namespace {