diff options
Diffstat (limited to 'src/scenery.hpp')
| -rw-r--r-- | src/scenery.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/scenery.hpp b/src/scenery.hpp index c462a433..e6e483fa 100644 --- a/src/scenery.hpp +++ b/src/scenery.hpp @@ -14,7 +14,7 @@ namespace floormat { template<typename... Ts> struct [[maybe_unused]] overloaded : Ts... { using Ts::operator()...; }; template<typename... Ts> overloaded(Ts...) -> overloaded<Ts...>; -struct chunk; +class chunk; class anim_atlas; class world; @@ -71,7 +71,7 @@ struct generic_scenery enum scenery_type scenery_type() const; explicit operator generic_scenery_proto() const; - generic_scenery(object_id id, struct chunk& c, const generic_scenery_proto& p); + generic_scenery(object_id id, class chunk& c, const generic_scenery_proto& p); }; struct door_scenery @@ -88,7 +88,7 @@ struct door_scenery enum scenery_type scenery_type() const; explicit operator door_scenery_proto() const; - door_scenery(object_id id, struct chunk& c, const door_scenery_proto& p); + door_scenery(object_id id, class chunk& c, const door_scenery_proto& p); }; using scenery_variants = std::variant<generic_scenery, door_scenery>; @@ -107,12 +107,12 @@ 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_scenery_type(object_id id, struct chunk& c, enum scenery_type type); + static scenery_variants subtype_from_proto(object_id id, class chunk& c, const scenery_proto_variants& variants); + static scenery_variants subtype_from_scenery_type(object_id id, class chunk& c, enum scenery_type type); private: friend class world; - scenery(object_id id, struct chunk& c, const scenery_proto& proto); + scenery(object_id id, class chunk& c, const scenery_proto& proto); }; template<> struct object_type_<scenery> : std::integral_constant<object_type, object_type::scenery> {}; |
