From 6d7e2446db66787096fc33edfa03d8021aa01d4b Mon Sep 17 00:00:00 2001 From: Ted John Date: Mon, 13 Dec 2021 22:11:55 +0000 Subject: [PATCH 1/2] Fix #16204: Invisible entrance/exits render as tiny land sprites --- src/openrct2-ui/windows/Ride.cpp | 2 +- src/openrct2/paint/tile_element/Paint.Entrance.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 3620661c43..fd3f8158ad 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -4878,7 +4878,7 @@ static void WindowRideColourPaint(rct_window* w, rct_drawpixelinfo* dpi) gfx_clear(&clippedDpi, PALETTE_INDEX_12); auto stationObj = ride_get_station_object(ride); - if (stationObj != nullptr && stationObj->BaseImageId != 0) + if (stationObj != nullptr && stationObj->BaseImageId != ImageIndexUndefined) { auto imageTemplate = ImageId(trackColour.main, trackColour.additional); auto imageId = imageTemplate.WithIndex(stationObj->BaseImageId); diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp index 369d5bdcb2..17bc837d65 100644 --- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp +++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp @@ -118,7 +118,7 @@ static void PaintRideEntranceExit(paint_session* session, uint8_t direction, int } auto stationObj = ride_get_station_object(ride); - if (stationObj == nullptr || stationObj->BaseImageId == 0) + if (stationObj == nullptr || stationObj->BaseImageId == ImageIndexUndefined) { return; } From 04dac023cb87411c1211509178325a781d1cc777 Mon Sep 17 00:00:00 2001 From: Ted John Date: Mon, 13 Dec 2021 22:16:24 +0000 Subject: [PATCH 2/2] Fix crash during underground mode Also includes crash during track design preview. --- src/openrct2/paint/tile_element/Paint.Surface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openrct2/paint/tile_element/Paint.Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp index 2f44488fab..3d65495636 100644 --- a/src/openrct2/paint/tile_element/Paint.Surface.cpp +++ b/src/openrct2/paint/tile_element/Paint.Surface.cpp @@ -1068,7 +1068,7 @@ void PaintSurface(paint_session* session, uint8_t direction, uint16_t height, co } if (session->ViewFlags & (VIEWPORT_FLAG_UNDERGROUND_INSIDE | VIEWPORT_FLAG_HIDE_BASE)) { - imageId = imageId.WithRemap(FilterPaletteID::PaletteDarken1).WithBlended(true); + imageId = imageId.WithTransparancy(FilterPaletteID::PaletteDarken1); } if (OpenRCT2::TileInspector::IsElementSelected(elementPtr))