mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 17:42:29 +01:00
Code Issues Releases Wiki Activity

Fix duplicate RGB colours in palette (#18299)

Browse Source 
* Remove duplicate RGB colours from palette

* Update hash

* Update reference dat file

---------

Co-authored-by: Spacek531 <spacek531@comcast.net>
Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
This commit is contained in:
Michael Steenbeek
2023-04-16 16:15:26 +02:00
committed by GitHub
parent 7011a9775c
commit 812ea151bb
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/drawing/ImageImporter.h
View File

@@ -361,18 +361,18 @@ constexpr const GamePalette StandardPalette = { {
{ 0, 255, 255, 255 }, { 0, 255, 255, 255 },
// 230 - 234 (Water waves) // 230 - 234 (Water waves)
{ 99, 107, 7, 255 },
{ 99, 107, 7, 255 },
{ 135, 143, 39, 255 }, { 135, 143, 39, 255 },
{ 123, 131, 27, 255 }, { 123, 131, 27, 255 },
{ 99, 107, 7, 255 }, { 95, 103, 7, 255 },
{ 87, 95, 0, 255 },
{ 111, 119, 15, 255 },
// 235 - 249 (Water sparkles) // 235 - 249 (Water sparkles)
{ 151, 155, 55, 255 }, { 255, 255, 199, 255 },
{ 151, 155, 55, 255 },
{ 227, 227, 155, 255 }, { 227, 227, 155, 255 },
{ 203, 203, 115, 255 }, { 175, 175, 83, 255 },
{ 151, 155, 55, 255 }, { 151, 155, 51, 255 },
{ 203, 203, 123, 255 },
// 240 - 242 (Extra grey) // 240 - 242 (Extra grey)
{ 91, 91, 67, 255 }, { 91, 91, 67, 255 },

2
test/tests/ImageImporterTests.cpp
View File

@@ -54,5 +54,5 @@ TEST_F(ImageImporterTests, Import_Logo)
// Update expected hash if change is expected. // Update expected hash if change is expected.
ASSERT_NE(nullptr, result.Buffer.data()); ASSERT_NE(nullptr, result.Buffer.data());
auto hash = GetHash(result.Buffer.data(), result.Buffer.size()); auto hash = GetHash(result.Buffer.data(), result.Buffer.size());
ASSERT_EQ(0xCEF27C7D, hash); ASSERT_EQ(uint32_t(0x212A99BC), hash);
} }

BIN
test/tests/testdata/sprites/example.dat vendored
View File

Binary file not shown.

BIN
test/tests/testdata/sprites/result.dat vendored
View File

Binary file not shown.