diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/scenery.cpp | 1 | ||||
-rw-r--r-- | src/scenery.hpp | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/scenery.cpp b/src/scenery.cpp index c3c0b7c1..004fd61b 100644 --- a/src/scenery.cpp +++ b/src/scenery.cpp @@ -41,7 +41,6 @@ void generic_scenery::update(scenery&, size_t, float) {} Vector2 generic_scenery::ordinal_offset(const scenery&, Vector2b offset) const { return Vector2(offset); } bool generic_scenery::can_activate(const scenery&, size_t) const { return interactive; } bool generic_scenery::activate(floormat::scenery&, size_t) { return false; } -object_type generic_scenery::type() const noexcept { return object_type::scenery; } enum scenery_type generic_scenery::scenery_type() const { return scenery_type::generic; } enum scenery_type scenery_proto::scenery_type() const diff --git a/src/scenery.hpp b/src/scenery.hpp index df5ac186..c462a433 100644 --- a/src/scenery.hpp +++ b/src/scenery.hpp @@ -34,7 +34,7 @@ struct generic_scenery_proto struct door_scenery_proto { unsigned char active : 1 = false; - unsigned char interactive : 1 = false; + unsigned char interactive : 1 = true; unsigned char closing : 1 = false; bool operator==(const door_scenery_proto& p) const; @@ -68,7 +68,6 @@ struct generic_scenery bool can_activate(const scenery& sc, size_t i) const; bool activate(scenery& sc, size_t i); - object_type type() const noexcept; enum scenery_type scenery_type() const; explicit operator generic_scenery_proto() const; @@ -86,7 +85,6 @@ struct door_scenery bool can_activate(const scenery& sc, size_t i) const; bool activate(scenery& sc, size_t i); - object_type type() const noexcept; enum scenery_type scenery_type() const; explicit operator door_scenery_proto() const; @@ -109,8 +107,7 @@ struct scenery final : object explicit operator scenery_proto() const; enum scenery_type scenery_type() const; - static scenery_variants subtype_from_proto(object_id id, struct chunk& c, - const scenery_proto_variants& variants); + static scenery_variants subtype_from_proto(object_id id, struct chunk& c, const scenery_proto_variants& variants); static scenery_variants subtype_from_scenery_type(object_id id, struct chunk& c, enum scenery_type type); private: |