diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-30 06:50:26 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-30 08:30:45 +0100 |
| commit | a813f35f824cb5a7370818b116578d148bc33687 (patch) | |
| tree | 06bf8f8aa302acb147db538fcad0dd5c027166e1 /serialize | |
| parent | 7d71fd8bc7e1a562aa8dac99832b5ca767d644d2 (diff) | |
scenery: remove 'animated' property
This can be inferred from 'active' and anim atlas frame count.
Diffstat (limited to 'serialize')
| -rw-r--r-- | serialize/scenery.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/serialize/scenery.cpp b/serialize/scenery.cpp index 330e6f39..94d9ad9d 100644 --- a/serialize/scenery.cpp +++ b/serialize/scenery.cpp @@ -88,7 +88,6 @@ void adl_serializer<scenery_proto>::to_json(json& j, const scenery_proto& val) j["passable"] = f.passable; j["blocks-view"] = f.blocks_view; j["active"] = f.active; - j["animated"] = f.animated; j["interactive"] = f.interactive; } @@ -113,14 +112,13 @@ void adl_serializer<scenery_proto>::from_json(const json& j, scenery_proto& val) bool passable = f.passable; get("passable", passable); bool blocks_view = f.blocks_view; get("blocks-view", blocks_view); bool active = f.active; get("active", active); - bool animated = f.animated; get("animated", animated); switch (type) { default: fm_abort("unhandled scenery type '%u'", (unsigned)type); case scenery_type::generic: - f = { scenery::generic, *val.atlas, r, frame, passable, blocks_view, animated, active }; + f = { scenery::generic, *val.atlas, r, frame, passable, blocks_view, active }; break; case scenery_type::door: f = { scenery::door, *val.atlas, r, false }; |
