Move ZipStream into new header

src/openrct2/core/ZipStream.hpp

@@ -0,0 +1,86 @@
+/*****************************************************************************
+ * Copyright (c) 2014-2021 OpenRCT2 developers
+ *
+ * For a complete list of all authors, please refer to contributors.md
+ * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
+ *
+ * OpenRCT2 is licensed under the GNU General Public License version 3.
+ *****************************************************************************/
+#pragma once
+
+#include "IStream.hpp"
+#include "Zip.h"
+
+#include <memory>
+
+namespace OpenRCT2
+{
+    /**
+     * Couples a zip archive and a zip item stream to ensure the lifetime of the zip archive is maintained
+     * for the lifetime of the stream.
+     */
+    class ZipStreamWrapper final : public IStream
+    {
+    private:
+        std::unique_ptr<IZipArchive> _zipArchive;
+        std::unique_ptr<IStream> _base;
+
+    public:
+        ZipStreamWrapper(std::unique_ptr<IZipArchive> zipArchive, std::unique_ptr<IStream> base)
+            : _zipArchive(std::move(zipArchive))
+            , _base(std::move(base))
+        {
+        }
+
+        bool CanRead() const override
+        {
+            return _base->CanRead();
+        }
+
+        bool CanWrite() const override
+        {
+            return _base->CanWrite();
+        }
+
+        uint64_t GetLength() const override
+        {
+            return _base->GetLength();
+        }
+
+        uint64_t GetPosition() const override
+        {
+            return _base->GetPosition();
+        }
+
+        void SetPosition(uint64_t position) override
+        {
+            _base->SetPosition(position);
+        }
+
+        void Seek(int64_t offset, int32_t origin) override
+        {
+            _base->Seek(offset, origin);
+        }
+
+        void Read(void* buffer, uint64_t length) override
+        {
+            _base->Read(buffer, length);
+        }
+
+        void Write(const void* buffer, uint64_t length) override
+        {
+            _base->Write(buffer, length);
+        }
+
+        uint64_t TryRead(void* buffer, uint64_t length) override
+        {
+            return _base->TryRead(buffer, length);
+        }
+
+        const void* GetData() const override
+        {
+            return _base->GetData();
+        }
+    };
+
+} // namespace OpenRCT2

src/openrct2/libopenrct2.vcxproj

@@ -185,6 +185,7 @@
     <ClInclude Include="core\StringBuilder.h" />
     <ClInclude Include="core\StringReader.h" />
     <ClInclude Include="core\Zip.h" />
+    <ClInclude Include="core\ZipStream.hpp" />
     <ClInclude Include="Date.h" />
     <ClInclude Include="Diagnostic.h" />
     <ClInclude Include="drawing\Drawing.h" />
@@ -923,4 +924,4 @@
     <ClCompile Include="world\Wall.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>

src/openrct2/object/Object.cpp

@@ -14,7 +14,7 @@
 #include "../core/FileStream.h"
 #include "../core/Memory.hpp"
 #include "../core/String.hpp"
-#include "../core/Zip.h"
+#include "../core/ZipStream.hpp"
 #include "../localisation/Language.h"
 #include "../localisation/LocalisationService.h"
 #include "../localisation/StringIds.h"
@@ -171,74 +171,6 @@ std::optional<uint8_t> rct_object_entry::GetSceneryType() const
     }
 }
 
-/**
- * Couples a zip archive and a zip item stream to ensure the lifetime of the zip archive is maintained
- * for the lifetime of the stream.
- */
-class ZipStreamWrapper final : public IStream
-{
-private:
-    std::unique_ptr<IZipArchive> _zipArchive;
-    std::unique_ptr<IStream> _base;
-
-public:
-    ZipStreamWrapper(std::unique_ptr<IZipArchive> zipArchive, std::unique_ptr<IStream> base)
-        : _zipArchive(std::move(zipArchive))
-        , _base(std::move(base))
-    {
-    }
-
-    bool CanRead() const override
-    {
-        return _base->CanRead();
-    }
-
-    bool CanWrite() const override
-    {
-        return _base->CanWrite();
-    }
-
-    uint64_t GetLength() const override
-    {
-        return _base->GetLength();
-    }
-
-    uint64_t GetPosition() const override
-    {
-        return _base->GetPosition();
-    }
-
-    void SetPosition(uint64_t position) override
-    {
-        _base->SetPosition(position);
-    }
-
-    void Seek(int64_t offset, int32_t origin) override
-    {
-        _base->Seek(offset, origin);
-    }
-
-    void Read(void* buffer, uint64_t length) override
-    {
-        _base->Read(buffer, length);
-    }
-
-    void Write(const void* buffer, uint64_t length) override
-    {
-        _base->Write(buffer, length);
-    }
-
-    uint64_t TryRead(void* buffer, uint64_t length) override
-    {
-        return _base->TryRead(buffer, length);
-    }
-
-    const void* GetData() const override
-    {
-        return _base->GetData();
-    }
-};
-
 bool ObjectAsset::IsAvailable() const
 {
     if (_zipPath.empty())