From 739d83e3215dfd3cc01c3ffbf60b59308b25c510 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Thu, 16 Oct 2025 13:51:08 +0200 Subject: [PATCH] Fix: scrolling intro background switches colour halfway through --- distribution/changelog.txt | 1 + src/openrct2/drawing/Drawing.cpp | 8 +++++--- src/openrct2/scenes/intro/IntroScene.cpp | 14 +++++++------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 594d19d89d..d27dd95a7c 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -11,6 +11,7 @@ - Fix: [#25299] The Mine Train Coaster left large helix draws incorrect sprites at certain angles (original bug). - Fix: [#25328] Spiral Slide in Blackpool Pleasure Beach has its entrance and exit the wrong way round (bug in the original scenario). - Fix: [#25342] The Go-Karts medium right gentle sloped turn does not have a tunnel at the end. +- Fix: [#25350] The scrolling intro background switches colour halfway through (original bug). - Fix: [#25358] The Stand Up Roller Coaster left corkscrew does not block supports correctly. - Fix: [#25363] The Mine Train Coaster flat-to-steep track pieces do not block all metal supports. - Fix: [#25369] The Go-Karts medium turns and small flat and sloped turns do not block metal supports correctly. diff --git a/src/openrct2/drawing/Drawing.cpp b/src/openrct2/drawing/Drawing.cpp index 40d7bf594b..f5d215dc01 100644 --- a/src/openrct2/drawing/Drawing.cpp +++ b/src/openrct2/drawing/Drawing.cpp @@ -703,9 +703,11 @@ void GfxTransposePalette(int32_t pal, uint8_t product) for (; width > 0; width--) { auto& dest_pointer = gGamePalette[x]; - dest_pointer.Blue = (source_pointer[0] * product) >> 8; - dest_pointer.Green = (source_pointer[1] * product) >> 8; - dest_pointer.Red = (source_pointer[2] * product) >> 8; + // Make sure the image never gets darker than the void colour (not-quite-block), to the background colour jumping + // between void and 100% black. + dest_pointer.Blue = std::max(35, ((source_pointer[0] * product) >> 8)); + dest_pointer.Green = std::max(35, ((source_pointer[1] * product) >> 8)); + dest_pointer.Red = std::max(23, ((source_pointer[2] * product) >> 8)); source_pointer += 3; x++; diff --git a/src/openrct2/scenes/intro/IntroScene.cpp b/src/openrct2/scenes/intro/IntroScene.cpp index 92eeec0a0a..f5e59aa475 100644 --- a/src/openrct2/scenes/intro/IntroScene.cpp +++ b/src/openrct2/scenes/intro/IntroScene.cpp @@ -27,8 +27,8 @@ namespace OpenRCT2 static constexpr PaletteIndex kBackgroundColourLogo = PaletteIndex::pi245; static constexpr PaletteIndex kBorderColourPublisher = PaletteIndex::pi129; - constexpr int32_t PALETTE_G1_IDX_DEVELOPER = 23217; - constexpr int32_t PALETTE_G1_IDX_LOGO = 23224; + static constexpr ImageIndex kPaletteChrisSawyerLogo = 23217; + static constexpr ImageIndex kPaletteRCT2Logo = 23224; static IntroState _introState; @@ -220,7 +220,7 @@ namespace OpenRCT2 break; case IntroState::DeveloperBegin: GfxClear(rt, kBackgroundColourDark); - GfxTransposePalette(PALETTE_G1_IDX_DEVELOPER, 255); + GfxTransposePalette(kPaletteChrisSawyerLogo, 255); break; case IntroState::DeveloperScroll: GfxClear(rt, kBackgroundColourDark); @@ -232,11 +232,11 @@ namespace OpenRCT2 case IntroState::LogoFadeIn: if (_introStateCounter <= 0xFF00) { - GfxTransposePalette(PALETTE_G1_IDX_LOGO, (_introStateCounter >> 8) & 0xFF); + GfxTransposePalette(kPaletteRCT2Logo, (_introStateCounter >> 8) & 0xFF); } else { - GfxTransposePalette(PALETTE_G1_IDX_LOGO, 255); + GfxTransposePalette(kPaletteRCT2Logo, 255); } ScreenIntroDrawLogo(rt); break; @@ -246,11 +246,11 @@ namespace OpenRCT2 case IntroState::LogoFadeOut: if (_introStateCounter >= 0) { - GfxTransposePalette(PALETTE_G1_IDX_LOGO, (_introStateCounter >> 8) & 0xFF); + GfxTransposePalette(kPaletteRCT2Logo, (_introStateCounter >> 8) & 0xFF); } else { - GfxTransposePalette(PALETTE_G1_IDX_LOGO, 0); + GfxTransposePalette(kPaletteRCT2Logo, 0); } ScreenIntroDrawLogo(rt); break;