From 5b194974ef6402bc204df07df8ddceb510283436 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 29 May 2021 18:32:36 +0100 Subject: [PATCH] Add support for zoom offsets to parkobj --- src/openrct2/drawing/ImageImporter.h | 3 ++- src/openrct2/object/ImageTable.cpp | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/openrct2/drawing/ImageImporter.h b/src/openrct2/drawing/ImageImporter.h index 6cd38e155a..3b2b26cd23 100644 --- a/src/openrct2/drawing/ImageImporter.h +++ b/src/openrct2/drawing/ImageImporter.h @@ -54,7 +54,8 @@ namespace OpenRCT2::Drawing private: static std::vector GetPixels( - const uint8_t* pixels, uint32_t pitch, uint32_t srcX, uint32_t srcY, uint32_t width, uint32_t height, IMPORT_FLAGS flags, IMPORT_MODE mode); + const uint8_t* pixels, uint32_t pitch, uint32_t srcX, uint32_t srcY, uint32_t width, uint32_t height, + IMPORT_FLAGS flags, IMPORT_MODE mode); static std::vector EncodeRaw(const int32_t* pixels, uint32_t width, uint32_t height); static std::vector EncodeRLE(const int32_t* pixels, uint32_t width, uint32_t height); diff --git a/src/openrct2/object/ImageTable.cpp b/src/openrct2/object/ImageTable.cpp index e3e705d8f2..2ff5b405d1 100644 --- a/src/openrct2/object/ImageTable.cpp +++ b/src/openrct2/object/ImageTable.cpp @@ -163,6 +163,7 @@ std::vector> ImageTable::ParseImages( auto srcHeight = Json::GetNumber(el["srcHeight"]); auto raw = Json::GetString(el["format"]) == "raw"; auto keepPalette = Json::GetString(el["palette"]) == "keep"; + auto zoomOffset = Json::GetNumber(el["zoom"]); std::vector> result; try @@ -194,7 +195,9 @@ std::vector> ImageTable::ParseImages( ImageImporter importer; auto importResult = importer.Import(image, srcX, srcY, srcWidth, srcHeight, x, y, flags); - result.push_back(std::make_unique(importResult.Element)); + auto g1element = importResult.Element; + g1element.zoomed_offset = zoomOffset; + result.push_back(std::make_unique(g1element)); } catch (const std::exception& e) {