From 4e77740facb23e1c392f180381ccb5446d445724 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 15 Oct 2022 11:40:19 +0200 Subject: a --- serialize/anim.cpp | 2 +- serialize/anim.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'serialize') diff --git a/serialize/anim.cpp b/serialize/anim.cpp index 0e3b371f..18bca85a 100644 --- a/serialize/anim.cpp +++ b/serialize/anim.cpp @@ -10,7 +10,7 @@ namespace floormat::Serialize { NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(anim_frame, ground, offset, size) NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(anim_group, name, frames, ground) -NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(anim, name, nframes, actionframe, fps, groups, width, height) +NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(anim, object_name, anim_name, nframes, actionframe, fps, groups, width, height) } // namespace floormat::Serialize diff --git a/serialize/anim.hpp b/serialize/anim.hpp index 244799fb..957e733e 100644 --- a/serialize/anim.hpp +++ b/serialize/anim.hpp @@ -34,7 +34,7 @@ struct anim final { static constexpr int default_fps = 24; - std::string name; + std::string object_name, anim_name; std::array groups; int nframes = 0; int width = 0, height = 0; -- cgit v1.2.3