summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2022-11-30 06:50:26 +0100
committerStanislaw Halik <sthalik@misaki.pl>2022-11-30 08:30:45 +0100
commita813f35f824cb5a7370818b116578d148bc33687 (patch)
tree06bf8f8aa302acb147db538fcad0dd5c027166e1 /src
parent7d71fd8bc7e1a562aa8dac99832b5ca767d644d2 (diff)
scenery: remove 'animated' property
This can be inferred from 'active' and anim atlas frame count.
Diffstat (limited to 'src')
-rw-r--r--src/scenery.cpp4
-rw-r--r--src/scenery.hpp4
2 files changed, 3 insertions, 5 deletions
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;