scenery: remove 'animated' property

This can be inferred from 'active' and anim atlas frame count.

3 files changed, 4 insertions, 8 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 };
diff --git a/src/scenery.cpp b/src/scenery.cpp
index dfb72b65..6e3d08ac 100644
--- a/src/scenery.cpp
+++ b/src/scenery.cpp
@@ -31,9 +31,9 @@ scenery_ref::operator bool() const noexcept { return atlas != nullptr; }
 scenery::scenery() noexcept : scenery{none_tag_t{}} {}
 scenery::scenery(none_tag_t) noexcept : passable{true} {}
 scenery::scenery(generic_tag_t, const anim_atlas& atlas, rotation r, frame_t frame,
-                 bool passable, bool blocks_view, bool animated, bool active, bool interactive) :
+                 bool passable, bool blocks_view, bool active, bool interactive) :
     frame{frame}, r{r}, type{scenery_type::generic},
-    passable{passable}, blocks_view{blocks_view}, active{active}, animated{animated},
+    passable{passable}, blocks_view{blocks_view}, active{active},
     interactive{interactive}
 {
     fm_assert(r < rotation_COUNT);
diff --git a/src/scenery.hpp b/src/scenery.hpp
index 90cead3d..5f755bfd 100644
--- a/src/scenery.hpp
+++ b/src/scenery.hpp
@@ -37,14 +37,12 @@ struct scenery final
     std::uint8_t blocks_view : 1 = false; // todo
     std::uint8_t active      : 1 = false;
     std::uint8_t closing     : 1 = false;
-    std::uint8_t animated    : 1 = false; // todo
     std::uint8_t interactive : 1 = false;
 
     scenery() noexcept;
     scenery(none_tag_t) noexcept;
     scenery(generic_tag_t, const anim_atlas& atlas, rotation r, frame_t frame = 0,
-            bool passable = false, bool blocks_view = false, bool animated = false,
-            bool active = false, bool interactive = false);
+            bool passable = false, bool blocks_view = false, bool active = false, bool interactive = false);
     scenery(door_tag_t, const anim_atlas& atlas, rotation r, bool is_open = false);
 
     bool can_activate() const noexcept;