diff options
Diffstat (limited to 'serialize')
| -rw-r--r-- | serialize/old-savegame.cpp | 2 | ||||
| -rw-r--r-- | serialize/scenery.cpp | 6 | ||||
| -rw-r--r-- | serialize/scenery.hpp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/serialize/old-savegame.cpp b/serialize/old-savegame.cpp index df0cbbb5..14313f5b 100644 --- a/serialize/old-savegame.cpp +++ b/serialize/old-savegame.cpp @@ -4,7 +4,7 @@ #include "src/critter.hpp" #include "src/light.hpp" #include "loader/loader.hpp" -#include "loader/scenery.hpp" +#include "loader/scenery-cell.hpp" #include "src/ground-atlas.hpp" #include "src/anim-atlas.hpp" #include "src/chunk-scenery.hpp" diff --git a/serialize/scenery.cpp b/serialize/scenery.cpp index b51fac74..8935ee3d 100644 --- a/serialize/scenery.cpp +++ b/serialize/scenery.cpp @@ -4,7 +4,7 @@ #include "compat/assert.hpp" #include "loader/loader.hpp" #include "serialize/corrade-string.hpp" -#include "loader/scenery.hpp" +#include "loader/scenery-cell.hpp" #include "serialize/pass-mode.hpp" #include "serialize/magnum-vector.hpp" #include <Corrade/Containers/String.h> @@ -182,7 +182,7 @@ void adl_serializer<scenery_proto>::from_json(const json& j, scenery_proto& f) } } -void adl_serializer<serialized_scenery>::to_json(json& j, const serialized_scenery& val) +void adl_serializer<scenery_cell>::to_json(json& j, const scenery_cell& val) { fm_soft_assert(val.proto.atlas); j = val.proto; @@ -190,7 +190,7 @@ void adl_serializer<serialized_scenery>::to_json(json& j, const serialized_scene j["name"] = name; } -void adl_serializer<serialized_scenery>::from_json(const json& j, serialized_scenery& val) +void adl_serializer<scenery_cell>::from_json(const json& j, scenery_cell& val) { val = {}; val.proto = j; diff --git a/serialize/scenery.hpp b/serialize/scenery.hpp index 93ceeb57..6df4a843 100644 --- a/serialize/scenery.hpp +++ b/serialize/scenery.hpp @@ -3,7 +3,7 @@ #include <Corrade/Containers/String.h> #include <nlohmann/json_fwd.hpp> -namespace floormat { struct serialized_scenery; } +namespace floormat { struct scenery_cell; } namespace nlohmann { @@ -22,9 +22,9 @@ template<> struct adl_serializer<floormat::scenery_proto> { static void from_json(const json& j, floormat::scenery_proto& 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); +template<> struct adl_serializer<floormat::scenery_cell> { + static void to_json(json& j, const floormat::scenery_cell& val); + static void from_json(const json& j, floormat::scenery_cell& val); }; } // namespace nlohmann |