From d965553cae58d0babfbb3a0bb30707c968c400bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= <janisozaur@gmail.com>
Date: Wed, 9 May 2018 15:59:05 +0200
Subject: [PATCH] Fix Android Zip changes

---
 src/openrct2/core/ZipAndroid.cpp           | 8 ++++----
 src/openrct2/title/TitleSequencePlayer.cpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/openrct2/core/ZipAndroid.cpp b/src/openrct2/core/ZipAndroid.cpp
index e60e5660c4..a85cbb6421 100644
--- a/src/openrct2/core/ZipAndroid.cpp
+++ b/src/openrct2/core/ZipAndroid.cpp
@@ -119,7 +119,7 @@ public:
         return std::vector<uint8>(dataPtr, dataPtr + dataSize);
     }
 
-    void void SetFileData(const std::string_view& path, std::vector<uint8>&& data) override
+    void SetFileData(const std::string_view& path, std::vector<uint8>&& data) override
     {
         STUB();
     }
@@ -139,15 +139,15 @@ namespace Zip
 {
     std::unique_ptr<IZipArchive> Open(const std::string_view& path, ZIP_ACCESS access)
     {
-        return new ZipArchive(path, access);
+        return std::make_unique<ZipArchive>(path, access);
     }
 
-    std::unique_ptr<IZipArchive> TryOpen(const std::string_view path, ZIP_ACCESS access)
+    std::unique_ptr<IZipArchive> TryOpen(const std::string_view& path, ZIP_ACCESS access)
     {
         std::unique_ptr<IZipArchive> result;
         try
         {
-            result = new ZipArchive(path, access);
+            result = std::make_unique<ZipArchive>(path, access);
         }
         catch (const std::exception&)
         {
diff --git a/src/openrct2/title/TitleSequencePlayer.cpp b/src/openrct2/title/TitleSequencePlayer.cpp
index ca586cada8..98dc150825 100644
--- a/src/openrct2/title/TitleSequencePlayer.cpp
+++ b/src/openrct2/title/TitleSequencePlayer.cpp
@@ -501,7 +501,7 @@ private:
         w->saved_view_x = gSavedViewX;
         w->saved_view_y = gSavedViewY;
 
-        char zoomDifference = gSavedViewZoom - w->viewport->zoom;
+        sint8 zoomDifference = gSavedViewZoom - w->viewport->zoom;
         w->viewport->zoom = gSavedViewZoom;
         gCurrentRotation = gSavedViewRotation;
         if (zoomDifference != 0)