diff options
Diffstat (limited to 'src/scenery.hpp')
| -rw-r--r-- | src/scenery.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/scenery.hpp b/src/scenery.hpp index 17fdad66..1c3b03ad 100644 --- a/src/scenery.hpp +++ b/src/scenery.hpp @@ -2,7 +2,7 @@ #include "pass-mode.hpp" #include "tile-defs.hpp" #include "rotation.hpp" -#include "entity.hpp" +#include "object.hpp" #include <type_traits> #include <Magnum/Math/Vector2.h> #include <Magnum/Magnum.h> @@ -18,7 +18,7 @@ enum class scenery_type : unsigned char { }; constexpr inline size_t scenery_type_BITS = 3; -struct scenery_proto : entity_proto +struct scenery_proto : object_proto { scenery_type sc_type : scenery_type_BITS = scenery_type::none; unsigned char active : 1 = false; @@ -29,11 +29,11 @@ struct scenery_proto : entity_proto scenery_proto(const scenery_proto&); ~scenery_proto() noexcept override; scenery_proto& operator=(const scenery_proto&); - bool operator==(const entity_proto& proto) const override; + bool operator==(const object_proto& proto) const override; operator bool() const; }; -struct scenery final : entity +struct scenery final : object { scenery_type sc_type : 3 = scenery_type::none; unsigned char active : 1 = false; @@ -46,7 +46,7 @@ struct scenery final : entity bool can_activate(size_t i) const override; bool activate(size_t i) override; - entity_type type() const noexcept override; + object_type type() const noexcept override; explicit operator scenery_proto() const; private: @@ -54,7 +54,7 @@ private: scenery(object_id id, struct chunk& c, const scenery_proto& proto); }; -template<> struct entity_type_<scenery> : std::integral_constant<entity_type, entity_type::scenery> {}; -template<> struct entity_type_<scenery_proto> : std::integral_constant<entity_type, entity_type::scenery> {}; +template<> struct object_type_<scenery> : std::integral_constant<object_type, object_type::scenery> {}; +template<> struct object_type_<scenery_proto> : std::integral_constant<object_type, object_type::scenery> {}; } // namespace floormat |