summaryrefslogtreecommitdiffhomepage
path: root/serialize
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2022-10-15 11:40:19 +0200
committerStanislaw Halik <sthalik@misaki.pl>2022-10-15 11:40:19 +0200
commit4e77740facb23e1c392f180381ccb5446d445724 (patch)
treed629c4d2960546dab2ed759d756674533baac536 /serialize
parenta99c6ebd1c24e3f645e2c07591cfcfa97a162a6b (diff)
a
Diffstat (limited to 'serialize')
-rw-r--r--serialize/anim.cpp2
-rw-r--r--serialize/anim.hpp2
2 files changed, 2 insertions, 2 deletions
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<anim_group, (std::size_t)anim_direction::COUNT> groups;
int nframes = 0;
int width = 0, height = 0;