serialize, loader, test: add serializing scenery

1 files changed, 4 insertions, 12 deletions

diff --git a/serialize/scenery.hpp b/serialize/scenery.hpp
index e3eb977a..f3ceb586 100644
--- a/serialize/scenery.hpp
+++ b/serialize/scenery.hpp
@@ -4,15 +4,7 @@
 #include <Corrade/Containers/String.h>
 #include <nlohmann/json_fwd.hpp>
 
-namespace floormat::Serialize {
-
-struct serialized_scenery final
-{
-    String name, descr;
-    scenery_proto proto;
-};
-
-} // namespace floormat::Serialize
+namespace floormat { struct serialized_scenery; }
 
 namespace nlohmann {
 
@@ -31,9 +23,9 @@ template<> struct adl_serializer<floormat::scenery_proto> {
     static void from_json(const json& j, floormat::scenery_proto& val);
 };
 
-template<> struct adl_serializer<floormat::Serialize::serialized_scenery> {
-    static void to_json(json& j, const floormat::Serialize::serialized_scenery& val);
-    static void from_json(const json& j, floormat::Serialize::serialized_scenery& val);
+template<> struct adl_serializer<floormat::serialized_scenery> {
+    static void to_json(json& j, const floormat::serialized_scenery& val);
+    static void from_json(const json& j, floormat::serialized_scenery& val);
 };
 
 } // namespace nlohmann