From 3f669cae8583929a6ba5287dc688d3020315a288 Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Tue, 28 Sep 2021 19:30:19 +0200 Subject: [PATCH] Use zoomlevel some more --- src/openrct2/interface/Viewport.cpp | 6 +++--- src/openrct2/ride/TrackDesign.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index 1ca5c65475..999f98d6c1 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -175,10 +175,10 @@ void viewport_create(rct_window* w, const ScreenCoordsXY& screenCoords, int32_t viewport->pos = screenCoords; viewport->width = width; viewport->height = height; - const auto zoom = focus.zoom; - viewport->view_width = width << static_cast(zoom); - viewport->view_height = height << static_cast(zoom); + const auto zoom = focus.zoom; + viewport->view_width = width * zoom; + viewport->view_height = height * zoom; viewport->zoom = zoom; viewport->flags = 0; diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index d2bee192a6..1178e5a1b3 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -2099,7 +2099,7 @@ void TrackDesignDrawPreview(TrackDesign* td6, uint8_t* pixels) size_z = 0; } - int32_t zoom_level = 1; + ZoomLevel zoom_level = 1; if (size_x < size_y) { @@ -2116,8 +2116,8 @@ void TrackDesignDrawPreview(TrackDesign* td6, uint8_t* pixels) zoom_level = 3; } - size_x = 370 << zoom_level; - size_y = 217 << zoom_level; + size_x = 370 * zoom_level; + size_y = 217 * zoom_level; rct_viewport view; view.width = 370;