From f3735dc07685db4945f60b68edd7517d3813d2c4 Mon Sep 17 00:00:00 2001
From: Hielke Morsink <hielke.morsink@gmail.com>
Date: Tue, 28 Sep 2021 18:09:40 +0200
Subject: [PATCH] Use ZoomLevel for viewport and ride window

---
 src/openrct2-ui/windows/Ride.cpp    | 2 +-
 src/openrct2/interface/Viewport.cpp | 4 ++--
 src/openrct2/interface/Window.h     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp
index f14bcce3e5..dc0840b71a 100644
--- a/src/openrct2-ui/windows/Ride.cpp
+++ b/src/openrct2-ui/windows/Ride.cpp
@@ -778,7 +778,7 @@ static std::unique_ptr<TrackDesign> _trackDesign;
 struct RideOverallView
 {
     CoordsXYZ loc;
-    uint8_t zoom;
+    ZoomLevel zoom;
 };
 
 static std::vector<RideOverallView> ride_overall_views = {};
diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp
index ca0ffcb8de..1ca5c65475 100644
--- a/src/openrct2/interface/Viewport.cpp
+++ b/src/openrct2/interface/Viewport.cpp
@@ -177,8 +177,8 @@ void viewport_create(rct_window* w, const ScreenCoordsXY& screenCoords, int32_t
     viewport->height = height;
     const auto zoom = focus.zoom;
 
-    viewport->view_width = width << zoom;
-    viewport->view_height = height << zoom;
+    viewport->view_width = width << static_cast<int8_t>(zoom);
+    viewport->view_height = height << static_cast<int8_t>(zoom);
     viewport->zoom = zoom;
     viewport->flags = 0;
 
diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h
index be37922de5..17a8120755 100644
--- a/src/openrct2/interface/Window.h
+++ b/src/openrct2/interface/Window.h
@@ -200,10 +200,10 @@ struct Focus
     using CoordinateFocus = CoordsXYZ;
     using EntityFocus = uint16_t;
 
-    uint8_t zoom = 0;
+    ZoomLevel zoom{};
     std::variant<CoordinateFocus, EntityFocus> data;
 
-    template<typename T> constexpr explicit Focus(T newValue, uint8_t newZoom = 0)
+    template<typename T> constexpr explicit Focus(T newValue, ZoomLevel newZoom = {})
     {
         data = newValue;
         zoom = newZoom;