From 3eee9984127b804297b52032150d3f67f02cfe83 Mon Sep 17 00:00:00 2001 From: Javidx9 <25419386+OneLoneCoder@users.noreply.github.com> Date: Mon, 22 Jul 2024 21:22:32 +0100 Subject: [PATCH] Fix Renderable move constructors --- olcPixelGameEngine.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/olcPixelGameEngine.h b/olcPixelGameEngine.h index f2c6872a..74456c09 100644 --- a/olcPixelGameEngine.h +++ b/olcPixelGameEngine.h @@ -888,13 +888,15 @@ namespace olc { public: Renderable() = default; - Renderable(Renderable&& r) : pSprite(std::move(r.pSprite)), pDecal(std::move(r.pDecal)) {} + Renderable(Renderable&& r) = default; + Renderable& operator=(Renderable&& r) = default; Renderable(const Renderable&) = delete; olc::rcode Load(const std::string& sFile, ResourcePack* pack = nullptr, bool filter = false, bool clamp = true); void Create(uint32_t width, uint32_t height, bool filter = false, bool clamp = true); olc::Decal* Decal() const; olc::Sprite* Sprite() const; + private: std::unique_ptr pSprite = nullptr; std::unique_ptr pDecal = nullptr; @@ -4023,7 +4025,7 @@ namespace olc if(!bClipAndScale) vInvScreenSize = 1.0f / olc::vf2d(viewSize); else - vInvScreenSize = 1.0f / olc::vf2d(vViewSize); + vInvScreenSize = 1.0f / olc::vf2d(vScreenSize); } void PixelGameEngine::adv_FlushLayer(const size_t nLayerID)