summaryrefslogtreecommitdiffhomepage
path: root/src/scenery.hpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2023-03-19 10:42:54 +0100
committerStanislaw Halik <sthalik@misaki.pl>2023-03-19 10:42:54 +0100
commit61d46a790cfde35bedf4283cbbcce06639cce1ec (patch)
treeffdbda2cb8fc4e47144aa25458e8191488cea478 /src/scenery.hpp
parentb93313e438c7b943e506f3c16675e5d38edd0537 (diff)
src/entity: move type data member to vtable
Diffstat (limited to 'src/scenery.hpp')
-rw-r--r--src/scenery.hpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/scenery.hpp b/src/scenery.hpp
index a985d7d7..b52ddded 100644
--- a/src/scenery.hpp
+++ b/src/scenery.hpp
@@ -41,14 +41,16 @@ struct scenery final : entity
unsigned char closing : 1 = false;
unsigned char interactive : 1 = false;
+ bool update(size_t i, float dt) override;
bool can_activate(size_t i) const override;
bool activate(size_t i) override;
- bool update(size_t i, float dt) override;
+
+ entity_type type() const noexcept override;
explicit operator scenery_proto() const;
private:
friend struct world;
- scenery(object_id id, struct chunk& c, entity_type type, const scenery_proto& proto);
+ scenery(object_id id, struct chunk& c, const scenery_proto& proto);
};
template<> struct entity_type_<scenery> : std::integral_constant<entity_type, entity_type::scenery> {};