diff options
| -rw-r--r-- | src/scenery.cpp | 6 | ||||
| -rw-r--r-- | src/scenery.hpp | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/scenery.cpp b/src/scenery.cpp index 26213757..e0b62211 100644 --- a/src/scenery.cpp +++ b/src/scenery.cpp @@ -25,11 +25,13 @@ enum scenery_type door_scenery_proto::scenery_type() { return scenery_type::door // --- scenery_proto --- scenery_proto::scenery_proto() noexcept { type = object_type::scenery; } +scenery_proto::~scenery_proto() noexcept = default; +scenery_proto::operator bool() const { return atlas != nullptr; } scenery_proto& scenery_proto::operator=(const scenery_proto&) noexcept = default; scenery_proto::scenery_proto(const scenery_proto&) noexcept = default; -scenery_proto::~scenery_proto() noexcept = default; -scenery_proto::operator bool() const { return atlas != nullptr; } +scenery_proto& scenery_proto::operator=(scenery_proto&&) noexcept = default; +scenery_proto::scenery_proto(scenery_proto&&) noexcept = default; enum scenery_type scenery_proto::scenery_type() const { diff --git a/src/scenery.hpp b/src/scenery.hpp index 6ae7a10a..8db32f91 100644 --- a/src/scenery.hpp +++ b/src/scenery.hpp @@ -40,12 +40,14 @@ struct scenery_proto : object_proto scenery_proto_variants subtype; // todo! add std::monostate scenery_proto() noexcept; - scenery_proto(const scenery_proto&) noexcept; ~scenery_proto() noexcept override; - scenery_proto& operator=(const scenery_proto&) noexcept; - bool operator==(const object_proto& proto) const override; explicit operator bool() const; + bool operator==(const object_proto& proto) const override; enum scenery_type scenery_type() const; + scenery_proto(const scenery_proto&) noexcept; + scenery_proto& operator=(const scenery_proto&) noexcept; + scenery_proto(scenery_proto&&) noexcept; + scenery_proto& operator=(scenery_proto&&) noexcept; }; struct scenery; |