From 5010b06671af7e5a2fe1c35ecc3fba84c16a604a Mon Sep 17 00:00:00 2001 From: SirLynix Date: Tue, 10 Sep 2024 18:06:04 +0200 Subject: [PATCH] Fix errors and warnings --- include/ClientLib/Systems/AnimationSystem.hpp | 4 ++-- include/ClientLib/Systems/MovementInterpolationSystem.hpp | 4 ++-- include/ClientLib/Systems/PlayerAnimationSystem.hpp | 4 ++-- include/CommonLib/Ship.hpp | 4 ++-- src/CommonLib/Entities/ChunkClassLibrary.cpp | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/ClientLib/Systems/AnimationSystem.hpp b/include/ClientLib/Systems/AnimationSystem.hpp index 3da531d7..6bbadfcc 100644 --- a/include/ClientLib/Systems/AnimationSystem.hpp +++ b/include/ClientLib/Systems/AnimationSystem.hpp @@ -23,14 +23,14 @@ namespace tsom inline AnimationSystem(entt::registry& registry); AnimationSystem(const AnimationSystem&) = delete; - AnimationSystem(AnimationSystem&&) = default; + AnimationSystem(AnimationSystem&&) = delete; ~AnimationSystem() = default; void Update(Nz::Time elapsedTime); void UpdateAnimationStates(Nz::Time elapsedTime); AnimationSystem& operator=(const AnimationSystem&) = delete; - AnimationSystem& operator=(AnimationSystem&&) = default; + AnimationSystem& operator=(AnimationSystem&&) = delete; private: entt::registry& m_registry; diff --git a/include/ClientLib/Systems/MovementInterpolationSystem.hpp b/include/ClientLib/Systems/MovementInterpolationSystem.hpp index 11ad1c38..483cde9d 100644 --- a/include/ClientLib/Systems/MovementInterpolationSystem.hpp +++ b/include/ClientLib/Systems/MovementInterpolationSystem.hpp @@ -28,13 +28,13 @@ namespace tsom MovementInterpolationSystem(entt::registry& registry, Nz::Time movementTickDuration, std::size_t targetMovementPoints = 4); MovementInterpolationSystem(const MovementInterpolationSystem&) = delete; - MovementInterpolationSystem(MovementInterpolationSystem&&) = default; + MovementInterpolationSystem(MovementInterpolationSystem&&) = delete; ~MovementInterpolationSystem() = default; void Update(Nz::Time elapsedTime); MovementInterpolationSystem& operator=(const MovementInterpolationSystem&) = delete; - MovementInterpolationSystem& operator=(MovementInterpolationSystem&&) = default; + MovementInterpolationSystem& operator=(MovementInterpolationSystem&&) = delete; private: entt::observer m_interpolatedObserver; diff --git a/include/ClientLib/Systems/PlayerAnimationSystem.hpp b/include/ClientLib/Systems/PlayerAnimationSystem.hpp index 2a44211e..3166e74c 100644 --- a/include/ClientLib/Systems/PlayerAnimationSystem.hpp +++ b/include/ClientLib/Systems/PlayerAnimationSystem.hpp @@ -23,13 +23,13 @@ namespace tsom inline PlayerAnimationSystem(entt::registry& registry); PlayerAnimationSystem(const PlayerAnimationSystem&) = delete; - PlayerAnimationSystem(PlayerAnimationSystem&&) = default; + PlayerAnimationSystem(PlayerAnimationSystem&&) = delete; ~PlayerAnimationSystem() = default; void Update(Nz::Time elapsedTime); PlayerAnimationSystem& operator=(const PlayerAnimationSystem&) = delete; - PlayerAnimationSystem& operator=(PlayerAnimationSystem&&) = default; + PlayerAnimationSystem& operator=(PlayerAnimationSystem&&) = delete; private: entt::registry& m_registry; diff --git a/include/CommonLib/Ship.hpp b/include/CommonLib/Ship.hpp index 3e7670ca..ec19616e 100644 --- a/include/CommonLib/Ship.hpp +++ b/include/CommonLib/Ship.hpp @@ -26,7 +26,7 @@ namespace tsom public: Ship(float tileSize); Ship(const Ship&) = delete; - Ship(Ship&&) noexcept = default; + Ship(Ship&&) = delete; ~Ship() = default; FlatChunk& AddChunk(const BlockLibrary& blockLibrary, const ChunkIndices& indices, const Nz::FunctionRef& initCallback = nullptr); @@ -50,7 +50,7 @@ namespace tsom inline void UpdateUpDirection(const Nz::Vector3f& upDirection); Ship& operator=(const Ship&) = delete; - Ship& operator=(Ship&&) noexcept = default; + Ship& operator=(Ship&&) = delete; static constexpr unsigned int ChunkSize = 32; diff --git a/src/CommonLib/Entities/ChunkClassLibrary.cpp b/src/CommonLib/Entities/ChunkClassLibrary.cpp index b4336875..1f2a9079 100644 --- a/src/CommonLib/Entities/ChunkClassLibrary.cpp +++ b/src/CommonLib/Entities/ChunkClassLibrary.cpp @@ -17,9 +17,9 @@ namespace tsom { registry.RegisterClass(EntityClass("planet", { { - { .name = "CellSize", .type = EntityPropertyType::Float, .defaultValue = EntityPropertySingleValue(1.f), .isNetworked = true }, - { .name = "CornerRadius", .type = EntityPropertyType::Float, .defaultValue = EntityPropertySingleValue(16.f), .isNetworked = true }, - { .name = "Gravity", .type = EntityPropertyType::Float, .defaultValue = EntityPropertySingleValue(9.81f), .isNetworked = true } + EntityClass::Property { .name = "CellSize", .type = EntityPropertyType::Float, .defaultValue = EntityPropertySingleValue(1.f), .isNetworked = true }, + EntityClass::Property { .name = "CornerRadius", .type = EntityPropertyType::Float, .defaultValue = EntityPropertySingleValue(16.f), .isNetworked = true }, + EntityClass::Property { .name = "Gravity", .type = EntityPropertyType::Float, .defaultValue = EntityPropertySingleValue(9.81f), .isNetworked = true } } }, {