From a03613df35379f0f5966dfbbf68a15c9ffb94748 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Tue, 23 Sep 2025 21:09:54 +0200 Subject: [PATCH] Change FilterPaletteID to lowerCamelCase --- .../engines/opengl/OpenGLDrawingEngine.cpp | 2 +- .../drawing/engines/opengl/TextureCache.cpp | 2 +- src/openrct2-ui/interface/InGameConsole.cpp | 4 +- src/openrct2-ui/interface/Widget.cpp | 4 +- src/openrct2-ui/interface/Widget.h | 2 +- src/openrct2-ui/interface/Window.cpp | 6 +- src/openrct2-ui/scripting/CustomListView.cpp | 4 +- src/openrct2-ui/scripting/CustomWindow.cpp | 2 +- src/openrct2-ui/windows/Dropdown.cpp | 2 +- .../windows/EditorBottomToolbar.cpp | 4 +- .../windows/EditorInventionsList.cpp | 2 +- .../windows/EditorObjectSelection.cpp | 2 +- .../windows/EditorScenarioOptions.cpp | 2 +- src/openrct2-ui/windows/GameBottomToolbar.cpp | 6 +- src/openrct2-ui/windows/Guest.cpp | 2 +- src/openrct2-ui/windows/GuestList.cpp | 4 +- src/openrct2-ui/windows/LoadSave.cpp | 2 +- src/openrct2-ui/windows/Multiplayer.cpp | 4 +- src/openrct2-ui/windows/RideList.cpp | 2 +- src/openrct2-ui/windows/ScenarioSelect.cpp | 2 +- src/openrct2-ui/windows/Scenery.cpp | 8 +- src/openrct2-ui/windows/ServerList.cpp | 2 +- src/openrct2-ui/windows/ShortcutKeys.cpp | 2 +- src/openrct2-ui/windows/StaffList.cpp | 2 +- src/openrct2-ui/windows/TitleMenu.cpp | 2 +- src/openrct2-ui/windows/Tooltip.cpp | 20 +- src/openrct2-ui/windows/TopToolbar.cpp | 6 +- src/openrct2-ui/windows/TrackList.cpp | 4 +- src/openrct2/drawing/Drawing.cpp | 160 +++++----- src/openrct2/drawing/Drawing.h | 274 +++++++++--------- src/openrct2/interface/Chat.cpp | 2 +- src/openrct2/interface/Viewport.cpp | 2 +- src/openrct2/paint/Paint.cpp | 2 +- src/openrct2/paint/Paint.h | 4 +- src/openrct2/paint/VirtualFloor.cpp | 2 +- src/openrct2/paint/support/MetalSupports.cpp | 4 +- src/openrct2/paint/support/WoodenSupports.cpp | 2 +- .../paint/tile_element/Paint.Banner.cpp | 4 +- .../paint/tile_element/Paint.Entrance.cpp | 8 +- .../paint/tile_element/Paint.LargeScenery.cpp | 6 +- .../paint/tile_element/Paint.Path.cpp | 16 +- .../paint/tile_element/Paint.SmallScenery.cpp | 6 +- .../paint/tile_element/Paint.Surface.cpp | 20 +- .../paint/tile_element/Paint.TileElement.cpp | 4 +- .../paint/tile_element/Paint.Wall.cpp | 6 +- .../track/coaster/WoodenRollerCoaster.cpp | 2 +- src/openrct2/paint/track/gentle/Dodgems.cpp | 2 +- .../track/transport/MiniatureRailway.cpp | 4 +- .../vehicle/Vehicle.ObservationTower.cpp | 4 +- .../paint/vehicle/Vehicle.Submarine.cpp | 4 +- src/openrct2/paint/vehicle/VehiclePaint.cpp | 4 +- src/openrct2/world/Climate.cpp | 10 +- 52 files changed, 329 insertions(+), 329 deletions(-) diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp index 2eaa95537c..f0f09b81f2 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp @@ -955,7 +955,7 @@ void OpenGLDrawingContext::DrawSprite(RenderTarget& rt, const ImageId imageId, c paletteCount = 1; FilterPaletteID palette = static_cast(imageId.GetRemap()); palettes.x = TextureCache::PaletteToY(palette); - if (palette == FilterPaletteID::PaletteWater) + if (palette == FilterPaletteID::paletteWater) { special = true; } diff --git a/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp b/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp index 5e238563a2..1f290cde6f 100644 --- a/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp @@ -425,7 +425,7 @@ GLuint TextureCache::GetBlendPaletteTexture() GLint TextureCache::PaletteToY(FilterPaletteID palette) { - return palette > FilterPaletteID::PaletteWater ? EnumValue(palette) + 5 : EnumValue(palette) + 1; + return palette > FilterPaletteID::paletteWater ? EnumValue(palette) + 5 : EnumValue(palette) + 1; } #endif /* DISABLE_OPENGL */ diff --git a/src/openrct2-ui/interface/InGameConsole.cpp b/src/openrct2-ui/interface/InGameConsole.cpp index 0127ba3e49..44b09c1061 100644 --- a/src/openrct2-ui/interface/InGameConsole.cpp +++ b/src/openrct2-ui/interface/InGameConsole.cpp @@ -310,12 +310,12 @@ void InGameConsole::Draw(RenderTarget& rt) const Invalidate(); // Give console area a translucent effect. - GfxFilterRect(rt, { _consoleTopLeft, _consoleBottomRight }, FilterPaletteID::Palette51); + GfxFilterRect(rt, { _consoleTopLeft, _consoleBottomRight }, FilterPaletteID::palette51); // Make input area more opaque. GfxFilterRect( rt, { { _consoleTopLeft.x, _consoleBottomRight.y - lineHeight - 10 }, _consoleBottomRight - ScreenCoordsXY{ 0, 1 } }, - FilterPaletteID::Palette51); + FilterPaletteID::palette51); // Paint background colour. auto backgroundColour = ThemeGetColour(WindowClass::console, 0); diff --git a/src/openrct2-ui/interface/Widget.cpp b/src/openrct2-ui/interface/Widget.cpp index f7fd73bdd0..4d12a443b5 100644 --- a/src/openrct2-ui/interface/Widget.cpp +++ b/src/openrct2-ui/interface/Widget.cpp @@ -235,7 +235,7 @@ namespace OpenRCT2::Ui if (widget.image.GetIndex() == kImageIndexUndefined) { // Set standard tab sprite to use. - widget.image = ImageId(SPR_TAB, FilterPaletteID::PaletteNull); + widget.image = ImageId(SPR_TAB, FilterPaletteID::paletteNull); } } @@ -550,7 +550,7 @@ namespace OpenRCT2::Ui else GfxFilterRect( rt, { { topLeft + ScreenCoordsXY{ 1, 1 } }, { bottomRight - ScreenCoordsXY{ 1, 1 } } }, - FilterPaletteID::PaletteDarken3); + FilterPaletteID::paletteDarken3); // Draw text if (widget->text == kStringIdNone) diff --git a/src/openrct2-ui/interface/Widget.h b/src/openrct2-ui/interface/Widget.h index b2c369bad3..8de17d6b22 100644 --- a/src/openrct2-ui/interface/Widget.h +++ b/src/openrct2-ui/interface/Widget.h @@ -78,7 +78,7 @@ namespace OpenRCT2::Ui const ScreenCoordsXY& origin, const ScreenSize& size, WidgetType type, WindowColour colour, ImageIndex content, StringId tooltip = kStringIdNone) { - return makeWidget(origin, size, type, colour, ImageId(content, FilterPaletteID::PaletteNull), tooltip); + return makeWidget(origin, size, type, colour, ImageId(content, FilterPaletteID::paletteNull), tooltip); } constexpr Widget makeTab(const ScreenCoordsXY& origin, StringId tooltip = kStringIdNone) diff --git a/src/openrct2-ui/interface/Window.cpp b/src/openrct2-ui/interface/Window.cpp index 447b1ca27c..7a92872627 100644 --- a/src/openrct2-ui/interface/Window.cpp +++ b/src/openrct2-ui/interface/Window.cpp @@ -214,8 +214,8 @@ namespace OpenRCT2::Ui if (entryWidgetType == WidgetType::imgBtn) { - auto expectedContent1 = ImageId(SPR_LAND_TOOL_DECREASE, FilterPaletteID::PaletteNull); - auto expectedContent2 = ImageId(SPR_LAND_TOOL_INCREASE, FilterPaletteID::PaletteNull); + auto expectedContent1 = ImageId(SPR_LAND_TOOL_DECREASE, FilterPaletteID::paletteNull); + auto expectedContent2 = ImageId(SPR_LAND_TOOL_INCREASE, FilterPaletteID::paletteNull); auto button1Image = w.widgets[*spinnerGroupIndex + 1].image; auto button2Image = w.widgets[*spinnerGroupIndex + 2].image; @@ -1023,7 +1023,7 @@ namespace OpenRCT2::Ui::Windows { if ((w.flags.has(WindowFlag::transparent)) && !(w.flags.has(WindowFlag::noBackground))) GfxFilterRect( - rt, { w.windowPos, w.windowPos + ScreenCoordsXY{ w.width - 1, w.height - 1 } }, FilterPaletteID::Palette51); + rt, { w.windowPos, w.windowPos + ScreenCoordsXY{ w.width - 1, w.height - 1 } }, FilterPaletteID::palette51); // todo: some code missing here? Between 006EB18C and 006EB260 for (WidgetIndex widgetIndex = 0; widgetIndex < w.widgets.size(); widgetIndex++) diff --git a/src/openrct2-ui/scripting/CustomListView.cpp b/src/openrct2-ui/scripting/CustomListView.cpp index ee941972aa..5b6c9841c3 100644 --- a/src/openrct2-ui/scripting/CustomListView.cpp +++ b/src/openrct2-ui/scripting/CustomListView.cpp @@ -596,12 +596,12 @@ void CustomListView::Paint(WindowBase* w, RenderTarget& rt, const ScrollArea* sc if (isSelected) { GfxFilterRect( - rt, { { rt.x, y }, { rt.x + rt.width, y + (kListRowHeight - 1) } }, FilterPaletteID::PaletteDarken2); + rt, { { rt.x, y }, { rt.x + rt.width, y + (kListRowHeight - 1) } }, FilterPaletteID::paletteDarken2); } else if (isHighlighted) { GfxFilterRect( - rt, { { rt.x, y }, { rt.x + rt.width, y + (kListRowHeight - 1) } }, FilterPaletteID::PaletteDarken2); + rt, { { rt.x, y }, { rt.x + rt.width, y + (kListRowHeight - 1) } }, FilterPaletteID::paletteDarken2); } else if (isStriped) { diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp index 723b7a209f..9cdb4c16a7 100644 --- a/src/openrct2-ui/scripting/CustomWindow.cpp +++ b/src/openrct2-ui/scripting/CustomWindow.cpp @@ -906,7 +906,7 @@ namespace OpenRCT2::Ui::Windows widget.right = widget.left + 30; widget.top = 17; widget.bottom = kTabBarHeight; - widget.image = ImageId(SPR_TAB, FilterPaletteID::PaletteNull); + widget.image = ImageId(SPR_TAB, FilterPaletteID::paletteNull); widget.tooltip = kStringIdNone; widgetList.push_back(widget); _info.WidgetIndexMap.push_back(std::numeric_limits::max()); diff --git a/src/openrct2-ui/windows/Dropdown.cpp b/src/openrct2-ui/windows/Dropdown.cpp index fea62ecda9..2596ade153 100644 --- a/src/openrct2-ui/windows/Dropdown.cpp +++ b/src/openrct2-ui/windows/Dropdown.cpp @@ -142,7 +142,7 @@ namespace OpenRCT2::Ui::Windows { // Darken the cell's background slightly when highlighted const ScreenCoordsXY rightBottom = screenCoords + ScreenCoordsXY{ ItemWidth - 1, ItemHeight - 1 }; - GfxFilterRect(rt, { screenCoords, rightBottom }, FilterPaletteID::PaletteDarken3); + GfxFilterRect(rt, { screenCoords, rightBottom }, FilterPaletteID::paletteDarken3); } const auto& item = gDropdown.items[i]; diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp index 09bc868a0c..1226708d95 100644 --- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp +++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp @@ -336,7 +336,7 @@ namespace OpenRCT2::Ui::Windows const auto& previousWidget = widgets[WIDX_PREVIOUS_IMAGE]; auto leftTop = windowPos + ScreenCoordsXY{ previousWidget.left, previousWidget.top }; auto rightBottom = windowPos + ScreenCoordsXY{ previousWidget.right, previousWidget.bottom }; - GfxFilterRect(rt, { leftTop, rightBottom }, FilterPaletteID::Palette51); + GfxFilterRect(rt, { leftTop, rightBottom }, FilterPaletteID::palette51); } void DrawLeftButton(RenderTarget& rt) @@ -374,7 +374,7 @@ namespace OpenRCT2::Ui::Windows auto nextWidget = widgets[WIDX_NEXT_IMAGE]; auto leftTop = windowPos + ScreenCoordsXY{ nextWidget.left, nextWidget.top }; auto rightBottom = windowPos + ScreenCoordsXY{ nextWidget.right, nextWidget.bottom }; - GfxFilterRect(rt, { leftTop, rightBottom }, FilterPaletteID::Palette51); + GfxFilterRect(rt, { leftTop, rightBottom }, FilterPaletteID::palette51); } void DrawRightButton(RenderTarget& rt) diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index 0d7e76813f..c3e5a5153e 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -301,7 +301,7 @@ namespace OpenRCT2::Ui::Windows bottom = itemY; } - GfxFilterRect(rt, { 0, top, boxWidth, bottom }, FilterPaletteID::PaletteDarken1); + GfxFilterRect(rt, { 0, top, boxWidth, bottom }, FilterPaletteID::paletteDarken1); } if (dragItem != nullptr && researchItem == *dragItem) diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index 96b5403f11..6d97b6e625 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -748,7 +748,7 @@ namespace OpenRCT2::Ui::Windows if (highlighted) { auto bottom = screenCoords.y + (kScrollableRowHeight - 1); - GfxFilterRect(rt, { 0, screenCoords.y, width, bottom }, FilterPaletteID::PaletteDarken1); + GfxFilterRect(rt, { 0, screenCoords.y, width, bottom }, FilterPaletteID::paletteDarken1); } // Draw checkmark diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index 635135ad2b..3c893ee7a3 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -2354,7 +2354,7 @@ namespace OpenRCT2::Ui::Windows if (i == selectedListItem) { stringId = STR_WINDOW_COLOUR_2_STRINGID; - GfxFilterRect(rt, { 0, y, width, y + 11 }, FilterPaletteID::PaletteDarken1); + GfxFilterRect(rt, { 0, y, width, y + 11 }, FilterPaletteID::paletteDarken1); } // Checkbox mark diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp index 729e4b99cd..0eaa88fe00 100644 --- a/src/openrct2-ui/windows/GameBottomToolbar.cpp +++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp @@ -620,18 +620,18 @@ namespace OpenRCT2::Ui::Windows // Draw panel grey backgrounds auto leftTop = windowPos + ScreenCoordsXY{ leftWidget.left, leftWidget.top }; auto rightBottom = windowPos + ScreenCoordsXY{ leftWidget.right, leftWidget.bottom }; - GfxFilterRect(rt, { leftTop, rightBottom }, FilterPaletteID::Palette51); + GfxFilterRect(rt, { leftTop, rightBottom }, FilterPaletteID::palette51); leftTop = windowPos + ScreenCoordsXY{ rightWidget.left, rightWidget.top }; rightBottom = windowPos + ScreenCoordsXY{ rightWidget.right, rightWidget.bottom }; - GfxFilterRect(rt, { leftTop, rightBottom }, FilterPaletteID::Palette51); + GfxFilterRect(rt, { leftTop, rightBottom }, FilterPaletteID::palette51); if (ThemeGetFlags() & UITHEME_FLAG_USE_FULL_BOTTOM_TOOLBAR) { // Draw grey background leftTop = windowPos + ScreenCoordsXY{ middleWidget.left, middleWidget.top }; rightBottom = windowPos + ScreenCoordsXY{ middleWidget.right, middleWidget.bottom }; - GfxFilterRect(rt, { leftTop, rightBottom }, FilterPaletteID::Palette51); + GfxFilterRect(rt, { leftTop, rightBottom }, FilterPaletteID::palette51); } drawWidgets(rt); diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 098f734a92..654a119e84 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -1363,7 +1363,7 @@ namespace OpenRCT2::Ui::Windows StringId stringId = STR_BLACK_STRING; if (listIndex == selectedListItem) { - GfxFilterRect(rt, { 0, y, 800, y + 9 }, FilterPaletteID::PaletteDarken1); + GfxFilterRect(rt, { 0, y, 800, y + 9 }, FilterPaletteID::paletteDarken1); stringId = STR_WINDOW_COLOUR_2_STRINGID; } diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index be520e6fb0..9f86a0a293 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -655,7 +655,7 @@ namespace OpenRCT2::Ui::Windows StringId format = STR_BLACK_STRING; if (index == _highlightedIndex) { - GfxFilterRect(rt, { 0, y, 800, y + kScrollableRowHeight - 1 }, FilterPaletteID::PaletteDarken1); + GfxFilterRect(rt, { 0, y, 800, y + kScrollableRowHeight - 1 }, FilterPaletteID::paletteDarken1); format = STR_WINDOW_COLOUR_2_STRINGID; } @@ -725,7 +725,7 @@ namespace OpenRCT2::Ui::Windows StringId format = STR_BLACK_STRING; if (index == _highlightedIndex) { - GfxFilterRect(rt, { 0, y, 800, y + kSummarisedGuestsRowHeight }, FilterPaletteID::PaletteDarken1); + GfxFilterRect(rt, { 0, y, 800, y + kSummarisedGuestsRowHeight }, FilterPaletteID::paletteDarken1); format = STR_WINDOW_COLOUR_2_STRINGID; } diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index 581b4d4e95..79b0c3ce79 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -1100,7 +1100,7 @@ namespace OpenRCT2::Ui::Windows if (i == selectedListItem) { stringId = STR_WINDOW_COLOUR_2_STRINGID; - GfxFilterRect(rt, { 0, y, listWidth, y + kScrollableRowHeight }, FilterPaletteID::PaletteDarken1); + GfxFilterRect(rt, { 0, y, listWidth, y + kScrollableRowHeight }, FilterPaletteID::paletteDarken1); } // display a marker next to the currently loaded game file if (_listItems[i].loaded) diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index e30f619153..4566d6d2a5 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -269,7 +269,7 @@ namespace OpenRCT2::Ui::Windows { GfxFilterRect( rt, { 0, screenCoords.y, 800, screenCoords.y + kScrollableRowHeight - 1 }, - FilterPaletteID::PaletteDarken1); + FilterPaletteID::paletteDarken1); _buffer += Network::GetPlayerName(player); colour = colours[2]; } @@ -400,7 +400,7 @@ namespace OpenRCT2::Ui::Windows { GfxFilterRect( rt, { 0, screenCoords.y, 800, screenCoords.y + kScrollableRowHeight - 1 }, - FilterPaletteID::PaletteDarken1); + FilterPaletteID::paletteDarken1); } if (screenCoords.y > rt.y + rt.height) { diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index 867eb6506e..a0c20842d0 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -636,7 +636,7 @@ namespace OpenRCT2::Ui::Windows if (i == static_cast(selectedListItem)) { // Background highlight - GfxFilterRect(rt, { 0, y, 800, y + kScrollableRowHeight - 1 }, FilterPaletteID::PaletteDarken1); + GfxFilterRect(rt, { 0, y, 800, y + kScrollableRowHeight - 1 }, FilterPaletteID::paletteDarken1); format = STR_WINDOW_COLOUR_2_STRINGID; if (_quickDemolishMode) format = STR_LIGHTPINK_STRINGID; diff --git a/src/openrct2-ui/windows/ScenarioSelect.cpp b/src/openrct2-ui/windows/ScenarioSelect.cpp index d4b0714a4c..bca983c11b 100644 --- a/src/openrct2-ui/windows/ScenarioSelect.cpp +++ b/src/openrct2-ui/windows/ScenarioSelect.cpp @@ -580,7 +580,7 @@ namespace OpenRCT2::Ui::Windows bool isHighlighted = _highlightedScenario == scenario; if (isHighlighted) { - GfxFilterRect(rt, { 0, y, width, y + scenarioItemHeight - 1 }, FilterPaletteID::PaletteDarken1); + GfxFilterRect(rt, { 0, y, width, y + scenarioItemHeight - 1 }, FilterPaletteID::paletteDarken1); } bool isCompleted = scenario->Highscore != nullptr; diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 47333084f7..e76bbf71c0 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -1422,16 +1422,16 @@ namespace OpenRCT2::Ui::Windows if (tabInfo.IsMisc()) { - widget.image = ImageId(SPR_TAB_QUESTION, FilterPaletteID::PaletteNull); + widget.image = ImageId(SPR_TAB_QUESTION, FilterPaletteID::paletteNull); } else if (tabInfo.IsAll()) { - widget.image = ImageId(SPR_TAB, FilterPaletteID::PaletteNull); + widget.image = ImageId(SPR_TAB, FilterPaletteID::paletteNull); } else if (tabInfo.IsSceneryGroup()) { // Default tab image - widget.image = ImageId(SPR_TAB_QUESTION, FilterPaletteID::PaletteNull); + widget.image = ImageId(SPR_TAB_QUESTION, FilterPaletteID::paletteNull); // Scenery Group image auto scgEntry = tabInfo.GetSceneryGroupEntry(); @@ -1613,7 +1613,7 @@ namespace OpenRCT2::Ui::Windows if (_tabEntries[tabIndex].IsAll()) { - auto imageId = ImageId(SPR_G2_INFINITY, FilterPaletteID::PaletteNull); + auto imageId = ImageId(SPR_G2_INFINITY, FilterPaletteID::paletteNull); GfxDrawSprite(rt, imageId, offset + widgetCoordsXY); } } diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp index 72c1d20a96..e6568f89de 100644 --- a/src/openrct2-ui/windows/ServerList.cpp +++ b/src/openrct2-ui/windows/ServerList.cpp @@ -346,7 +346,7 @@ namespace OpenRCT2::Ui::Windows { GfxFilterRect( rt, { 0, screenCoords.y, listWidgetWidth, screenCoords.y + kItemHeight }, - FilterPaletteID::PaletteDarken1); + FilterPaletteID::paletteDarken1); _version = serverDetails.Version; } diff --git a/src/openrct2-ui/windows/ShortcutKeys.cpp b/src/openrct2-ui/windows/ShortcutKeys.cpp index 0243992ed2..52dd882dcf 100644 --- a/src/openrct2-ui/windows/ShortcutKeys.cpp +++ b/src/openrct2-ui/windows/ShortcutKeys.cpp @@ -511,7 +511,7 @@ namespace OpenRCT2::Ui::Windows if (isHighlighted) { format = STR_WINDOW_COLOUR_2_STRINGID; - GfxFilterRect(rt, { 0, y - 1, scrollWidth, y + (kScrollableRowHeight - 2) }, FilterPaletteID::PaletteDarken1); + GfxFilterRect(rt, { 0, y - 1, scrollWidth, y + (kScrollableRowHeight - 2) }, FilterPaletteID::paletteDarken1); } auto bindingOffset = (scrollWidth * 2) / 3; diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 713984b508..2a5b980852 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -400,7 +400,7 @@ namespace OpenRCT2::Ui::Windows if (i == _highlightedIndex) { - GfxFilterRect(rt, { 0, y, 800, y + (kScrollableRowHeight - 1) }, FilterPaletteID::PaletteDarken1); + GfxFilterRect(rt, { 0, y, 800, y + (kScrollableRowHeight - 1) }, FilterPaletteID::paletteDarken1); format = STR_WINDOW_COLOUR_2_STRINGID; if (_quickFireMode) diff --git a/src/openrct2-ui/windows/TitleMenu.cpp b/src/openrct2-ui/windows/TitleMenu.cpp index a23fcdeeaf..f13e82ea88 100644 --- a/src/openrct2-ui/windows/TitleMenu.cpp +++ b/src/openrct2-ui/windows/TitleMenu.cpp @@ -273,7 +273,7 @@ namespace OpenRCT2::Ui::Windows void onDraw(RenderTarget& rt) override { - GfxFilterRect(rt, _filterRect, FilterPaletteID::Palette51); + GfxFilterRect(rt, _filterRect, FilterPaletteID::palette51); drawWidgets(rt); } }; diff --git a/src/openrct2-ui/windows/Tooltip.cpp b/src/openrct2-ui/windows/Tooltip.cpp index de5bfa3052..b632388334 100644 --- a/src/openrct2-ui/windows/Tooltip.cpp +++ b/src/openrct2-ui/windows/Tooltip.cpp @@ -108,20 +108,20 @@ namespace OpenRCT2::Ui::Windows int32_t bottom = windowPos.y + height - 1; // Background - GfxFilterRect(rt, { { left + 1, top + 1 }, { right - 1, bottom - 1 } }, FilterPaletteID::Palette45); - GfxFilterRect(rt, { { left + 1, top + 1 }, { right - 1, bottom - 1 } }, FilterPaletteID::PaletteGlassLightOrange); + GfxFilterRect(rt, { { left + 1, top + 1 }, { right - 1, bottom - 1 } }, FilterPaletteID::palette45); + GfxFilterRect(rt, { { left + 1, top + 1 }, { right - 1, bottom - 1 } }, FilterPaletteID::paletteGlassLightOrange); // Sides - GfxFilterRect(rt, { { left + 0, top + 2 }, { left + 0, bottom - 2 } }, FilterPaletteID::PaletteDarken3); - GfxFilterRect(rt, { { right + 0, top + 2 }, { right + 0, bottom - 2 } }, FilterPaletteID::PaletteDarken3); - GfxFilterRect(rt, { { left + 2, bottom + 0 }, { right - 2, bottom + 0 } }, FilterPaletteID::PaletteDarken3); - GfxFilterRect(rt, { { left + 2, top + 0 }, { right - 2, top + 0 } }, FilterPaletteID::PaletteDarken3); + GfxFilterRect(rt, { { left + 0, top + 2 }, { left + 0, bottom - 2 } }, FilterPaletteID::paletteDarken3); + GfxFilterRect(rt, { { right + 0, top + 2 }, { right + 0, bottom - 2 } }, FilterPaletteID::paletteDarken3); + GfxFilterRect(rt, { { left + 2, bottom + 0 }, { right - 2, bottom + 0 } }, FilterPaletteID::paletteDarken3); + GfxFilterRect(rt, { { left + 2, top + 0 }, { right - 2, top + 0 } }, FilterPaletteID::paletteDarken3); // Corners - GfxFilterPixel(rt, { left + 1, top + 1 }, FilterPaletteID::PaletteDarken3); - GfxFilterPixel(rt, { right - 1, top + 1 }, FilterPaletteID::PaletteDarken3); - GfxFilterPixel(rt, { left + 1, bottom - 1 }, FilterPaletteID::PaletteDarken3); - GfxFilterPixel(rt, { right - 1, bottom - 1 }, FilterPaletteID::PaletteDarken3); + GfxFilterPixel(rt, { left + 1, top + 1 }, FilterPaletteID::paletteDarken3); + GfxFilterPixel(rt, { right - 1, top + 1 }, FilterPaletteID::paletteDarken3); + GfxFilterPixel(rt, { left + 1, bottom - 1 }, FilterPaletteID::paletteDarken3); + GfxFilterPixel(rt, { right - 1, bottom - 1 }, FilterPaletteID::paletteDarken3); // Text left = windowPos.x + ((width + 1) / 2) - 1; diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 55ec19be53..3e0af62ca8 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -1260,16 +1260,16 @@ namespace OpenRCT2::Ui::Windows }; uint32_t mapImageId = _imageIdByRotation[GetCurrentRotation()]; - widgets[WIDX_MAP].image = ImageId(mapImageId, FilterPaletteID::PaletteNull); + widgets[WIDX_MAP].image = ImageId(mapImageId, FilterPaletteID::paletteNull); } } void ApplyAudioState() { if (!OpenRCT2::Audio::gGameSoundsOff) - widgets[WIDX_MUTE].image = ImageId(SPR_G2_TOOLBAR_MUTE, FilterPaletteID::PaletteNull); + widgets[WIDX_MUTE].image = ImageId(SPR_G2_TOOLBAR_MUTE, FilterPaletteID::paletteNull); else - widgets[WIDX_MUTE].image = ImageId(SPR_G2_TOOLBAR_UNMUTE, FilterPaletteID::PaletteNull); + widgets[WIDX_MUTE].image = ImageId(SPR_G2_TOOLBAR_UNMUTE, FilterPaletteID::paletteNull); } void ApplyFootpathPressed() diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index ae5956b428..e1441d9abc 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -695,7 +695,7 @@ namespace OpenRCT2::Ui::Windows // Highlight GfxFilterRect( rt, { screenCoords, { width, screenCoords.y + kScrollableRowHeight - 1 } }, - FilterPaletteID::PaletteDarken1); + FilterPaletteID::paletteDarken1); stringId = STR_WINDOW_COLOUR_2_STRINGID; } else @@ -720,7 +720,7 @@ namespace OpenRCT2::Ui::Windows // Highlight GfxFilterRect( rt, { screenCoords, { width, screenCoords.y + kScrollableRowHeight - 1 } }, - FilterPaletteID::PaletteDarken1); + FilterPaletteID::paletteDarken1); stringId = STR_WINDOW_COLOUR_2_STRINGID; } else diff --git a/src/openrct2/drawing/Drawing.cpp b/src/openrct2/drawing/Drawing.cpp index a276cc100a..b4064b3af7 100644 --- a/src/openrct2/drawing/Drawing.cpp +++ b/src/openrct2/drawing/Drawing.cpp @@ -287,62 +287,62 @@ enum }; static constexpr FilterPaletteID kGlassPaletteIds[COLOUR_COUNT] = { - FilterPaletteID::PaletteGlassBlack, - FilterPaletteID::PaletteGlassGrey, - FilterPaletteID::PaletteGlassWhite, - FilterPaletteID::PaletteGlassDarkPurple, - FilterPaletteID::PaletteGlassLightPurple, - FilterPaletteID::PaletteGlassBrightPurple, - FilterPaletteID::PaletteGlassDarkBlue, - FilterPaletteID::PaletteGlassLightBlue, - FilterPaletteID::PaletteGlassIcyBlue, - FilterPaletteID::PaletteGlassTeal, - FilterPaletteID::PaletteGlassAquamarine, - FilterPaletteID::PaletteGlassSaturatedGreen, - FilterPaletteID::PaletteGlassDarkGreen, - FilterPaletteID::PaletteGlassMossGreen, - FilterPaletteID::PaletteGlassBrightGreen, - FilterPaletteID::PaletteGlassOliveGreen, - FilterPaletteID::PaletteGlassDarkOliveGreen, - FilterPaletteID::PaletteGlassBrightYellow, - FilterPaletteID::PaletteGlassYellow, - FilterPaletteID::PaletteGlassDarkYellow, - FilterPaletteID::PaletteGlassLightOrange, - FilterPaletteID::PaletteGlassDarkOrange, - FilterPaletteID::PaletteGlassLightBrown, - FilterPaletteID::PaletteGlassSaturatedBrown, - FilterPaletteID::PaletteGlassDarkBrown, - FilterPaletteID::PaletteGlassSalmonPink, - FilterPaletteID::PaletteGlassBordeauxRed, - FilterPaletteID::PaletteGlassSaturatedRed, - FilterPaletteID::PaletteGlassBrightRed, - FilterPaletteID::PaletteGlassDarkPink, - FilterPaletteID::PaletteGlassBrightPink, - FilterPaletteID::PaletteGlassLightPink, - FilterPaletteID::PaletteGlassDarkOliveDark, - FilterPaletteID::PaletteGlassDarkOliveLight, - FilterPaletteID::PaletteGlassSaturatedBrownLight, - FilterPaletteID::PaletteGlassBordeauxRedDark, - FilterPaletteID::PaletteGlassBordeauxRedLight, - FilterPaletteID::PaletteGlassGrassGreenDark, - FilterPaletteID::PaletteGlassGrassGreenLight, - FilterPaletteID::PaletteGlassOliveDark, - FilterPaletteID::PaletteGlassOliveLight, - FilterPaletteID::PaletteGlassSaturatedGreenLight, - FilterPaletteID::PaletteGlassTanDark, - FilterPaletteID::PaletteGlassTanLight, - FilterPaletteID::PaletteGlassDullPurpleLight, - FilterPaletteID::PaletteGlassDullGreenDark, - FilterPaletteID::PaletteGlassDullGreenLight, - FilterPaletteID::PaletteGlassSaturatedPurpleDark, - FilterPaletteID::PaletteGlassSaturatedPurpleLight, - FilterPaletteID::PaletteGlassOrangeLight, - FilterPaletteID::PaletteGlassAquaDark, - FilterPaletteID::PaletteGlassMagentaLight, - FilterPaletteID::PaletteGlassDullBrownDark, - FilterPaletteID::PaletteGlassDullBrownLight, - FilterPaletteID::PaletteGlassInvisible, - FilterPaletteID::PaletteGlassVoid, + FilterPaletteID::paletteGlassBlack, + FilterPaletteID::paletteGlassGrey, + FilterPaletteID::paletteGlassWhite, + FilterPaletteID::paletteGlassDarkPurple, + FilterPaletteID::paletteGlassLightPurple, + FilterPaletteID::paletteGlassBrightPurple, + FilterPaletteID::paletteGlassDarkBlue, + FilterPaletteID::paletteGlassLightBlue, + FilterPaletteID::paletteGlassIcyBlue, + FilterPaletteID::paletteGlassTeal, + FilterPaletteID::paletteGlassAquamarine, + FilterPaletteID::paletteGlassSaturatedGreen, + FilterPaletteID::paletteGlassDarkGreen, + FilterPaletteID::paletteGlassMossGreen, + FilterPaletteID::paletteGlassBrightGreen, + FilterPaletteID::paletteGlassOliveGreen, + FilterPaletteID::paletteGlassDarkOliveGreen, + FilterPaletteID::paletteGlassBrightYellow, + FilterPaletteID::paletteGlassYellow, + FilterPaletteID::paletteGlassDarkYellow, + FilterPaletteID::paletteGlassLightOrange, + FilterPaletteID::paletteGlassDarkOrange, + FilterPaletteID::paletteGlassLightBrown, + FilterPaletteID::paletteGlassSaturatedBrown, + FilterPaletteID::paletteGlassDarkBrown, + FilterPaletteID::paletteGlassSalmonPink, + FilterPaletteID::paletteGlassBordeauxRed, + FilterPaletteID::paletteGlassSaturatedRed, + FilterPaletteID::paletteGlassBrightRed, + FilterPaletteID::paletteGlassDarkPink, + FilterPaletteID::paletteGlassBrightPink, + FilterPaletteID::paletteGlassLightPink, + FilterPaletteID::paletteGlassDarkOliveDark, + FilterPaletteID::paletteGlassDarkOliveLight, + FilterPaletteID::paletteGlassSaturatedBrownLight, + FilterPaletteID::paletteGlassBordeauxRedDark, + FilterPaletteID::paletteGlassBordeauxRedLight, + FilterPaletteID::paletteGlassGrassGreenDark, + FilterPaletteID::paletteGlassGrassGreenLight, + FilterPaletteID::paletteGlassOliveDark, + FilterPaletteID::paletteGlassOliveLight, + FilterPaletteID::paletteGlassSaturatedGreenLight, + FilterPaletteID::paletteGlassTanDark, + FilterPaletteID::paletteGlassTanLight, + FilterPaletteID::paletteGlassDullPurpleLight, + FilterPaletteID::paletteGlassDullGreenDark, + FilterPaletteID::paletteGlassDullGreenLight, + FilterPaletteID::paletteGlassSaturatedPurpleDark, + FilterPaletteID::paletteGlassSaturatedPurpleLight, + FilterPaletteID::paletteGlassOrangeLight, + FilterPaletteID::paletteGlassAquaDark, + FilterPaletteID::paletteGlassMagentaLight, + FilterPaletteID::paletteGlassDullBrownDark, + FilterPaletteID::paletteGlassDullBrownLight, + FilterPaletteID::paletteGlassInvisible, + FilterPaletteID::paletteGlassVoid, }; // Previously 0x97FCBC use it to get the correct palette from g1_elements @@ -545,29 +545,29 @@ static constexpr uint16_t kPaletteToG1Offset[kPaletteTotalOffsets] = { SPR_PALETTE_GLASS_VOID, }; -static constexpr TranslucentWindowPalette kWindowPaletteGrey = { FilterPaletteID::PaletteTranslucentGrey, FilterPaletteID::PaletteTranslucentGreyHighlight, FilterPaletteID::PaletteTranslucentGreyShadow }; -static constexpr TranslucentWindowPalette kWindowPaletteLightPurple = { FilterPaletteID::PaletteTranslucentLightPurple, FilterPaletteID::PaletteTranslucentLightPurpleHighlight, FilterPaletteID::PaletteTranslucentLightPurpleShadow }; -static constexpr TranslucentWindowPalette kWindowPaletteBrightPurple = { FilterPaletteID::PaletteTranslucentBrightPurple, FilterPaletteID::PaletteTranslucentBrightPurpleHighlight, FilterPaletteID::PaletteTranslucentBrightPurpleShadow }; -static constexpr TranslucentWindowPalette kWindowPaletteLightBlue = { FilterPaletteID::PaletteTranslucentLightBlue, FilterPaletteID::PaletteTranslucentLightBlueHighlight, FilterPaletteID::PaletteTranslucentLightBlueShadow }; -static constexpr TranslucentWindowPalette kWindowPaletteTeal = { FilterPaletteID::PaletteTranslucentTeal, FilterPaletteID::PaletteTranslucentTealHighlight, FilterPaletteID::PaletteTranslucentTealShadow }; -static constexpr TranslucentWindowPalette kWindowPaletteBrightGreen = { FilterPaletteID::PaletteTranslucentBrightGreen, FilterPaletteID::PaletteTranslucentBrightGreenHighlight, FilterPaletteID::PaletteTranslucentBrightGreenShadow }; -static constexpr TranslucentWindowPalette kWindowPaletteDarkGreen = { FilterPaletteID::PaletteTranslucentDarkGreen, FilterPaletteID::PaletteTranslucentDarkGreenHighlight, FilterPaletteID::PaletteTranslucentDarkGreenShadow }; -static constexpr TranslucentWindowPalette kWindowPaletteMossGreen = { FilterPaletteID::PaletteTranslucentMossGreen, FilterPaletteID::PaletteTranslucentMossGreenHighlight, FilterPaletteID::PaletteTranslucentMossGreenShadow }; -static constexpr TranslucentWindowPalette kWindowPaletteOliveGreen = { FilterPaletteID::PaletteTranslucentOliveGreen, FilterPaletteID::PaletteTranslucentOliveGreenHighlight, FilterPaletteID::PaletteTranslucentOliveGreenShadow }; -static constexpr TranslucentWindowPalette kWindowPaletteDarkOliveGreen = { FilterPaletteID::PaletteTranslucentDarkOliveGreen, FilterPaletteID::PaletteTranslucentDarkOliveGreenHighlight, FilterPaletteID::PaletteTranslucentDarkOliveGreenShadow }; -static constexpr TranslucentWindowPalette kWindowPaletteYellow = { FilterPaletteID::PaletteTranslucentYellow, FilterPaletteID::PaletteTranslucentYellowHighlight, FilterPaletteID::PaletteTranslucentYellowShadow }; -static constexpr TranslucentWindowPalette kWindowPaletteLightOrange = { FilterPaletteID::PaletteTranslucentLightOrange, FilterPaletteID::PaletteTranslucentLightOrangeHighlight, FilterPaletteID::PaletteTranslucentLightOrangeShadow }; -static constexpr TranslucentWindowPalette kWindowPaletteLightBrown = { FilterPaletteID::PaletteTranslucentLightBrown, FilterPaletteID::PaletteTranslucentLightBrownHighlight, FilterPaletteID::PaletteTranslucentLightBrownShadow }; -static constexpr TranslucentWindowPalette kWindowPaletteDarkBrown = { FilterPaletteID::PaletteTranslucentDarkBrown, FilterPaletteID::PaletteTranslucentDarkBrownHighlight, FilterPaletteID::PaletteTranslucentDarkBrownShadow }; -static constexpr TranslucentWindowPalette kWindowPaletteSalmonPink = { FilterPaletteID::PaletteTranslucentSalmonPink, FilterPaletteID::PaletteTranslucentSalmonPinkHighlight, FilterPaletteID::PaletteTranslucentSalmonPinkShadow }; -static constexpr TranslucentWindowPalette kWindowPaletteBordeauxRed = { FilterPaletteID::PaletteTranslucentBordeauxRed, FilterPaletteID::PaletteTranslucentBordeauxRedHighlight, FilterPaletteID::PaletteTranslucentBordeauxRedShadow }; -static constexpr TranslucentWindowPalette kWindowPaletteBrightRed = { FilterPaletteID::PaletteTranslucentBrightRed, FilterPaletteID::PaletteTranslucentBrightRedHighlight, FilterPaletteID::PaletteTranslucentBrightRedShadow }; -static constexpr TranslucentWindowPalette kWindowPaletteBrightPink = { FilterPaletteID::PaletteTranslucentBrightPink, FilterPaletteID::PaletteTranslucentBrightPinkHighlight, FilterPaletteID::PaletteTranslucentBrightPinkShadow }; +static constexpr TranslucentWindowPalette kWindowPaletteGrey = { FilterPaletteID::paletteTranslucentGrey, FilterPaletteID::paletteTranslucentGreyHighlight, FilterPaletteID::paletteTranslucentGreyShadow }; +static constexpr TranslucentWindowPalette kWindowPaletteLightPurple = { FilterPaletteID::paletteTranslucentLightPurple, FilterPaletteID::paletteTranslucentLightPurpleHighlight, FilterPaletteID::paletteTranslucentLightPurpleShadow }; +static constexpr TranslucentWindowPalette kWindowPaletteBrightPurple = { FilterPaletteID::paletteTranslucentBrightPurple, FilterPaletteID::paletteTranslucentBrightPurpleHighlight, FilterPaletteID::paletteTranslucentBrightPurpleShadow }; +static constexpr TranslucentWindowPalette kWindowPaletteLightBlue = { FilterPaletteID::paletteTranslucentLightBlue, FilterPaletteID::paletteTranslucentLightBlueHighlight, FilterPaletteID::paletteTranslucentLightBlueShadow }; +static constexpr TranslucentWindowPalette kWindowPaletteTeal = { FilterPaletteID::paletteTranslucentTeal, FilterPaletteID::paletteTranslucentTealHighlight, FilterPaletteID::paletteTranslucentTealShadow }; +static constexpr TranslucentWindowPalette kWindowPaletteBrightGreen = { FilterPaletteID::paletteTranslucentBrightGreen, FilterPaletteID::paletteTranslucentBrightGreenHighlight, FilterPaletteID::paletteTranslucentBrightGreenShadow }; +static constexpr TranslucentWindowPalette kWindowPaletteDarkGreen = { FilterPaletteID::paletteTranslucentDarkGreen, FilterPaletteID::paletteTranslucentDarkGreenHighlight, FilterPaletteID::paletteTranslucentDarkGreenShadow }; +static constexpr TranslucentWindowPalette kWindowPaletteMossGreen = { FilterPaletteID::paletteTranslucentMossGreen, FilterPaletteID::paletteTranslucentMossGreenHighlight, FilterPaletteID::paletteTranslucentMossGreenShadow }; +static constexpr TranslucentWindowPalette kWindowPaletteOliveGreen = { FilterPaletteID::paletteTranslucentOliveGreen, FilterPaletteID::paletteTranslucentOliveGreenHighlight, FilterPaletteID::paletteTranslucentOliveGreenShadow }; +static constexpr TranslucentWindowPalette kWindowPaletteDarkOliveGreen = { FilterPaletteID::paletteTranslucentDarkOliveGreen, FilterPaletteID::paletteTranslucentDarkOliveGreenHighlight, FilterPaletteID::paletteTranslucentDarkOliveGreenShadow }; +static constexpr TranslucentWindowPalette kWindowPaletteYellow = { FilterPaletteID::paletteTranslucentYellow, FilterPaletteID::paletteTranslucentYellowHighlight, FilterPaletteID::paletteTranslucentYellowShadow }; +static constexpr TranslucentWindowPalette kWindowPaletteLightOrange = { FilterPaletteID::paletteTranslucentLightOrange, FilterPaletteID::paletteTranslucentLightOrangeHighlight, FilterPaletteID::paletteTranslucentLightOrangeShadow }; +static constexpr TranslucentWindowPalette kWindowPaletteLightBrown = { FilterPaletteID::paletteTranslucentLightBrown, FilterPaletteID::paletteTranslucentLightBrownHighlight, FilterPaletteID::paletteTranslucentLightBrownShadow }; +static constexpr TranslucentWindowPalette kWindowPaletteDarkBrown = { FilterPaletteID::paletteTranslucentDarkBrown, FilterPaletteID::paletteTranslucentDarkBrownHighlight, FilterPaletteID::paletteTranslucentDarkBrownShadow }; +static constexpr TranslucentWindowPalette kWindowPaletteSalmonPink = { FilterPaletteID::paletteTranslucentSalmonPink, FilterPaletteID::paletteTranslucentSalmonPinkHighlight, FilterPaletteID::paletteTranslucentSalmonPinkShadow }; +static constexpr TranslucentWindowPalette kWindowPaletteBordeauxRed = { FilterPaletteID::paletteTranslucentBordeauxRed, FilterPaletteID::paletteTranslucentBordeauxRedHighlight, FilterPaletteID::paletteTranslucentBordeauxRedShadow }; +static constexpr TranslucentWindowPalette kWindowPaletteBrightRed = { FilterPaletteID::paletteTranslucentBrightRed, FilterPaletteID::paletteTranslucentBrightRedHighlight, FilterPaletteID::paletteTranslucentBrightRedShadow }; +static constexpr TranslucentWindowPalette kWindowPaletteBrightPink = { FilterPaletteID::paletteTranslucentBrightPink, FilterPaletteID::paletteTranslucentBrightPinkHighlight, FilterPaletteID::paletteTranslucentBrightPinkShadow }; const TranslucentWindowPalette kTranslucentWindowPalettes[COLOUR_COUNT] = { kWindowPaletteGrey, // COLOUR_BLACK kWindowPaletteGrey, // COLOUR_GREY - { FilterPaletteID::PaletteTranslucentWhite, FilterPaletteID::PaletteTranslucentWhiteHighlight,FilterPaletteID::PaletteTranslucentWhiteShadow }, + { FilterPaletteID::paletteTranslucentWhite, FilterPaletteID::paletteTranslucentWhiteHighlight,FilterPaletteID::paletteTranslucentWhiteShadow }, kWindowPaletteLightPurple, // COLOUR_DARK_PURPLE kWindowPaletteLightPurple, // COLOUR_LIGHT_PURPLE kWindowPaletteBrightPurple, // COLOUR_BRIGHT_PURPLE @@ -596,7 +596,7 @@ const TranslucentWindowPalette kTranslucentWindowPalettes[COLOUR_COUNT] = { kWindowPaletteBrightRed, // COLOUR_BRIGHT_RED kWindowPaletteBrightPink, // COLOUR_DARK_PINK kWindowPaletteBrightPink, // COLOUR_BRIGHT_PINK - { FilterPaletteID::PaletteTranslucentLightPink, FilterPaletteID::PaletteTranslucentLightPinkHighlight, FilterPaletteID::PaletteTranslucentLightPinkShadow }, + { FilterPaletteID::paletteTranslucentLightPink, FilterPaletteID::paletteTranslucentLightPinkHighlight, FilterPaletteID::paletteTranslucentLightPinkShadow }, kWindowPaletteDarkOliveGreen, // COLOUR_DARK_OLIVE_DARK kWindowPaletteDarkOliveGreen, // COLOUR_DARK_OLIVE_LIGHT kWindowPaletteLightBrown, // COLOUR_SATURATED_BROWN_LIGHT @@ -619,8 +619,8 @@ const TranslucentWindowPalette kTranslucentWindowPalettes[COLOUR_COUNT] = { kWindowPaletteBrightPink, // COLOUR_MAGENTA_LIGHT kWindowPaletteDarkBrown, // COLOUR_DULL_BROWN_DARK kWindowPaletteDarkBrown, // COLOUR_DULL_BROWN_LIGHT - { FilterPaletteID::PaletteDarken1, FilterPaletteID::PaletteDarken1, FilterPaletteID::PaletteDarken1 }, - { FilterPaletteID::PaletteDarken2, FilterPaletteID::PaletteDarken2, FilterPaletteID::PaletteDarken2 }, + { FilterPaletteID::paletteDarken1, FilterPaletteID::paletteDarken1, FilterPaletteID::paletteDarken1 }, + { FilterPaletteID::paletteDarken2, FilterPaletteID::paletteDarken2, FilterPaletteID::paletteDarken2 }, }; // clang-format on @@ -1012,10 +1012,10 @@ void UpdatePaletteEffects() if (Config::Get().general.RenderWeatherGloom) { auto paletteId = ClimateGetWeatherGloomPaletteId(getGameState().weatherCurrent); - if (paletteId != FilterPaletteID::PaletteNull) + if (paletteId != FilterPaletteID::paletteNull) { shade = 1; - if (paletteId != FilterPaletteID::PaletteDarken1) + if (paletteId != FilterPaletteID::paletteDarken1) { shade = 2; } diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h index c11e469fcb..e6886d50e4 100644 --- a/src/openrct2/drawing/Drawing.h +++ b/src/openrct2/drawing/Drawing.h @@ -199,147 +199,147 @@ enum enum class FilterPaletteID : int32_t { - PaletteNull = 0, + paletteNull = 0, - PaletteWater = COLOUR_COUNT, + paletteWater = COLOUR_COUNT, - PaletteLandMarker0, // North (corner/edge) - PaletteLandMarker1, // East (corner/edge) - PaletteLandMarker2, // South (corner/edge) - PaletteLandMarker3, // West (corner/edge) - PaletteSceneryGroundMarker, - PaletteWaterMarker, - PaletteQuarterMarker0, // North (not sure why it couldn't just use PaletteLandMarker0) - PaletteQuarterMarker1, // East - PaletteQuarterMarker2, // South - PaletteQuarterMarker3, // West - PaletteRideGroundMarker, - PaletteGhost, // Construction marker - Palette45, // Decolourise + lighten - Palette46, + paletteLandMarker0, // North (corner/edge) + paletteLandMarker1, // East (corner/edge) + paletteLandMarker2, // South (corner/edge) + paletteLandMarker3, // West (corner/edge) + paletteSceneryGroundMarker, + paletteWaterMarker, + paletteQuarterMarker0, // North (not sure why it couldn't just use PaletteLandMarker0) + paletteQuarterMarker1, // East + paletteQuarterMarker2, // South + paletteQuarterMarker3, // West + paletteRideGroundMarker, + paletteGhost, // Construction marker + palette45, // Decolourise + lighten + palette46, - PaletteDarken3, + paletteDarken3, - PaletteDarken1 = PaletteDarken3 + 2, - PaletteDarken2, - Palette51, // Decolourise + darken - PaletteTranslucentGrey, - PaletteTranslucentGreyHighlight, - PaletteTranslucentGreyShadow, - PaletteTranslucentLightBlue, - PaletteTranslucentLightBlueHighlight, - PaletteTranslucentLightBlueShadow, - PaletteTranslucentBordeauxRed, - PaletteTranslucentBordeauxRedHighlight, - PaletteTranslucentBordeauxRedShadow, - PaletteTranslucentDarkGreen, - PaletteTranslucentDarkGreenHighlight, - PaletteTranslucentDarkGreenShadow, - PaletteTranslucentLightPurple, - PaletteTranslucentLightPurpleHighlight, - PaletteTranslucentLightPurpleShadow, - PaletteTranslucentDarkOliveGreen, - PaletteTranslucentDarkOliveGreenHighlight, - PaletteTranslucentDarkOliveGreenShadow, - PaletteTranslucentLightBrown, - PaletteTranslucentLightBrownHighlight, - PaletteTranslucentLightBrownShadow, - PaletteTranslucentYellow, - PaletteTranslucentYellowHighlight, - PaletteTranslucentYellowShadow, - PaletteTranslucentMossGreen, - PaletteTranslucentMossGreenHighlight, - PaletteTranslucentMossGreenShadow, - PaletteTranslucentOliveGreen, - PaletteTranslucentOliveGreenHighlight, - PaletteTranslucentOliveGreenShadow, - PaletteTranslucentBrightGreen, - PaletteTranslucentBrightGreenHighlight, - PaletteTranslucentBrightGreenShadow, - PaletteTranslucentSalmonPink, - PaletteTranslucentSalmonPinkHighlight, - PaletteTranslucentSalmonPinkShadow, - PaletteTranslucentBrightPurple, - PaletteTranslucentBrightPurpleHighlight, - PaletteTranslucentBrightPurpleShadow, - PaletteTranslucentBrightRed, - PaletteTranslucentBrightRedHighlight, - PaletteTranslucentBrightRedShadow, - PaletteTranslucentLightOrange, - PaletteTranslucentLightOrangeHighlight, - PaletteTranslucentLightOrangeShadow, - PaletteTranslucentTeal, - PaletteTranslucentTealHighlight, - PaletteTranslucentTealShadow, - PaletteTranslucentBrightPink, - PaletteTranslucentBrightPinkHighlight, - PaletteTranslucentBrightPinkShadow, - PaletteTranslucentDarkBrown, - PaletteTranslucentDarkBrownHighlight, - PaletteTranslucentDarkBrownShadow, - PaletteTranslucentLightPink, - PaletteTranslucentLightPinkHighlight, - PaletteTranslucentLightPinkShadow, - PaletteTranslucentWhite, - PaletteTranslucentWhiteHighlight, - PaletteTranslucentWhiteShadow, - PaletteGlass, - PaletteGlassBlack = PaletteGlass + COLOUR_BLACK, - PaletteGlassGrey = PaletteGlass + COLOUR_GREY, - PaletteGlassWhite = PaletteGlass + COLOUR_WHITE, - PaletteGlassDarkPurple = PaletteGlass + COLOUR_DARK_PURPLE, - PaletteGlassLightPurple = PaletteGlass + COLOUR_LIGHT_PURPLE, - PaletteGlassBrightPurple = PaletteGlass + COLOUR_BRIGHT_PURPLE, - PaletteGlassDarkBlue = PaletteGlass + COLOUR_DARK_BLUE, - PaletteGlassLightBlue = PaletteGlass + COLOUR_LIGHT_BLUE, - PaletteGlassIcyBlue = PaletteGlass + COLOUR_ICY_BLUE, - PaletteGlassTeal = PaletteGlass + COLOUR_TEAL, - PaletteGlassAquamarine = PaletteGlass + COLOUR_AQUAMARINE, - PaletteGlassSaturatedGreen = PaletteGlass + COLOUR_SATURATED_GREEN, - PaletteGlassDarkGreen = PaletteGlass + COLOUR_DARK_GREEN, - PaletteGlassMossGreen = PaletteGlass + COLOUR_MOSS_GREEN, - PaletteGlassBrightGreen = PaletteGlass + COLOUR_BRIGHT_GREEN, - PaletteGlassOliveGreen = PaletteGlass + COLOUR_OLIVE_GREEN, - PaletteGlassDarkOliveGreen = PaletteGlass + COLOUR_DARK_OLIVE_GREEN, - PaletteGlassBrightYellow = PaletteGlass + COLOUR_BRIGHT_YELLOW, - PaletteGlassYellow = PaletteGlass + COLOUR_YELLOW, - PaletteGlassDarkYellow = PaletteGlass + COLOUR_DARK_YELLOW, - PaletteGlassLightOrange = PaletteGlass + COLOUR_LIGHT_ORANGE, - PaletteGlassDarkOrange = PaletteGlass + COLOUR_DARK_ORANGE, - PaletteGlassLightBrown = PaletteGlass + COLOUR_LIGHT_BROWN, - PaletteGlassSaturatedBrown = PaletteGlass + COLOUR_SATURATED_BROWN, - PaletteGlassDarkBrown = PaletteGlass + COLOUR_DARK_BROWN, - PaletteGlassSalmonPink = PaletteGlass + COLOUR_SALMON_PINK, - PaletteGlassBordeauxRed = PaletteGlass + COLOUR_BORDEAUX_RED, - PaletteGlassSaturatedRed = PaletteGlass + COLOUR_SATURATED_RED, - PaletteGlassBrightRed = PaletteGlass + COLOUR_BRIGHT_RED, - PaletteGlassDarkPink = PaletteGlass + COLOUR_DARK_PINK, - PaletteGlassBrightPink = PaletteGlass + COLOUR_BRIGHT_PINK, - PaletteGlassLightPink = PaletteGlass + COLOUR_LIGHT_PINK, - PaletteGlassDarkOliveDark = PaletteGlass + COLOUR_DARK_OLIVE_DARK, - PaletteGlassDarkOliveLight = PaletteGlass + COLOUR_DARK_OLIVE_LIGHT, - PaletteGlassSaturatedBrownLight = PaletteGlass + COLOUR_SATURATED_BROWN_LIGHT, - PaletteGlassBordeauxRedDark = PaletteGlass + COLOUR_BORDEAUX_RED_DARK, - PaletteGlassBordeauxRedLight = PaletteGlass + COLOUR_BORDEAUX_RED_LIGHT, - PaletteGlassGrassGreenDark = PaletteGlass + COLOUR_GRASS_GREEN_DARK, - PaletteGlassGrassGreenLight = PaletteGlass + COLOUR_GRASS_GREEN_LIGHT, - PaletteGlassOliveDark = PaletteGlass + COLOUR_OLIVE_DARK, - PaletteGlassOliveLight = PaletteGlass + COLOUR_OLIVE_LIGHT, - PaletteGlassSaturatedGreenLight = PaletteGlass + COLOUR_SATURATED_GREEN_LIGHT, - PaletteGlassTanDark = PaletteGlass + COLOUR_TAN_DARK, - PaletteGlassTanLight = PaletteGlass + COLOUR_TAN_LIGHT, - PaletteGlassDullPurpleLight = PaletteGlass + COLOUR_DULL_PURPLE_LIGHT, - PaletteGlassDullGreenDark = PaletteGlass + COLOUR_DULL_GREEN_DARK, - PaletteGlassDullGreenLight = PaletteGlass + COLOUR_DULL_GREEN_LIGHT, - PaletteGlassSaturatedPurpleDark = PaletteGlass + COLOUR_SATURATED_PURPLE_DARK, - PaletteGlassSaturatedPurpleLight = PaletteGlass + COLOUR_SATURATED_PURPLE_LIGHT, - PaletteGlassOrangeLight = PaletteGlass + COLOUR_ORANGE_LIGHT, - PaletteGlassAquaDark = PaletteGlass + COLOUR_AQUA_DARK, - PaletteGlassMagentaLight = PaletteGlass + COLOUR_MAGENTA_LIGHT, - PaletteGlassDullBrownDark = PaletteGlass + COLOUR_DULL_BROWN_DARK, - PaletteGlassDullBrownLight = PaletteGlass + COLOUR_DULL_BROWN_LIGHT, - PaletteGlassInvisible = PaletteGlass + COLOUR_INVISIBLE, - PaletteGlassVoid = PaletteGlass + COLOUR_VOID, + paletteDarken1 = paletteDarken3 + 2, + paletteDarken2, + palette51, // Decolourise + darken + paletteTranslucentGrey, + paletteTranslucentGreyHighlight, + paletteTranslucentGreyShadow, + paletteTranslucentLightBlue, + paletteTranslucentLightBlueHighlight, + paletteTranslucentLightBlueShadow, + paletteTranslucentBordeauxRed, + paletteTranslucentBordeauxRedHighlight, + paletteTranslucentBordeauxRedShadow, + paletteTranslucentDarkGreen, + paletteTranslucentDarkGreenHighlight, + paletteTranslucentDarkGreenShadow, + paletteTranslucentLightPurple, + paletteTranslucentLightPurpleHighlight, + paletteTranslucentLightPurpleShadow, + paletteTranslucentDarkOliveGreen, + paletteTranslucentDarkOliveGreenHighlight, + paletteTranslucentDarkOliveGreenShadow, + paletteTranslucentLightBrown, + paletteTranslucentLightBrownHighlight, + paletteTranslucentLightBrownShadow, + paletteTranslucentYellow, + paletteTranslucentYellowHighlight, + paletteTranslucentYellowShadow, + paletteTranslucentMossGreen, + paletteTranslucentMossGreenHighlight, + paletteTranslucentMossGreenShadow, + paletteTranslucentOliveGreen, + paletteTranslucentOliveGreenHighlight, + paletteTranslucentOliveGreenShadow, + paletteTranslucentBrightGreen, + paletteTranslucentBrightGreenHighlight, + paletteTranslucentBrightGreenShadow, + paletteTranslucentSalmonPink, + paletteTranslucentSalmonPinkHighlight, + paletteTranslucentSalmonPinkShadow, + paletteTranslucentBrightPurple, + paletteTranslucentBrightPurpleHighlight, + paletteTranslucentBrightPurpleShadow, + paletteTranslucentBrightRed, + paletteTranslucentBrightRedHighlight, + paletteTranslucentBrightRedShadow, + paletteTranslucentLightOrange, + paletteTranslucentLightOrangeHighlight, + paletteTranslucentLightOrangeShadow, + paletteTranslucentTeal, + paletteTranslucentTealHighlight, + paletteTranslucentTealShadow, + paletteTranslucentBrightPink, + paletteTranslucentBrightPinkHighlight, + paletteTranslucentBrightPinkShadow, + paletteTranslucentDarkBrown, + paletteTranslucentDarkBrownHighlight, + paletteTranslucentDarkBrownShadow, + paletteTranslucentLightPink, + paletteTranslucentLightPinkHighlight, + paletteTranslucentLightPinkShadow, + paletteTranslucentWhite, + paletteTranslucentWhiteHighlight, + paletteTranslucentWhiteShadow, + paletteGlass, + paletteGlassBlack = paletteGlass + COLOUR_BLACK, + paletteGlassGrey = paletteGlass + COLOUR_GREY, + paletteGlassWhite = paletteGlass + COLOUR_WHITE, + paletteGlassDarkPurple = paletteGlass + COLOUR_DARK_PURPLE, + paletteGlassLightPurple = paletteGlass + COLOUR_LIGHT_PURPLE, + paletteGlassBrightPurple = paletteGlass + COLOUR_BRIGHT_PURPLE, + paletteGlassDarkBlue = paletteGlass + COLOUR_DARK_BLUE, + paletteGlassLightBlue = paletteGlass + COLOUR_LIGHT_BLUE, + paletteGlassIcyBlue = paletteGlass + COLOUR_ICY_BLUE, + paletteGlassTeal = paletteGlass + COLOUR_TEAL, + paletteGlassAquamarine = paletteGlass + COLOUR_AQUAMARINE, + paletteGlassSaturatedGreen = paletteGlass + COLOUR_SATURATED_GREEN, + paletteGlassDarkGreen = paletteGlass + COLOUR_DARK_GREEN, + paletteGlassMossGreen = paletteGlass + COLOUR_MOSS_GREEN, + paletteGlassBrightGreen = paletteGlass + COLOUR_BRIGHT_GREEN, + paletteGlassOliveGreen = paletteGlass + COLOUR_OLIVE_GREEN, + paletteGlassDarkOliveGreen = paletteGlass + COLOUR_DARK_OLIVE_GREEN, + paletteGlassBrightYellow = paletteGlass + COLOUR_BRIGHT_YELLOW, + paletteGlassYellow = paletteGlass + COLOUR_YELLOW, + paletteGlassDarkYellow = paletteGlass + COLOUR_DARK_YELLOW, + paletteGlassLightOrange = paletteGlass + COLOUR_LIGHT_ORANGE, + paletteGlassDarkOrange = paletteGlass + COLOUR_DARK_ORANGE, + paletteGlassLightBrown = paletteGlass + COLOUR_LIGHT_BROWN, + paletteGlassSaturatedBrown = paletteGlass + COLOUR_SATURATED_BROWN, + paletteGlassDarkBrown = paletteGlass + COLOUR_DARK_BROWN, + paletteGlassSalmonPink = paletteGlass + COLOUR_SALMON_PINK, + paletteGlassBordeauxRed = paletteGlass + COLOUR_BORDEAUX_RED, + paletteGlassSaturatedRed = paletteGlass + COLOUR_SATURATED_RED, + paletteGlassBrightRed = paletteGlass + COLOUR_BRIGHT_RED, + paletteGlassDarkPink = paletteGlass + COLOUR_DARK_PINK, + paletteGlassBrightPink = paletteGlass + COLOUR_BRIGHT_PINK, + paletteGlassLightPink = paletteGlass + COLOUR_LIGHT_PINK, + paletteGlassDarkOliveDark = paletteGlass + COLOUR_DARK_OLIVE_DARK, + paletteGlassDarkOliveLight = paletteGlass + COLOUR_DARK_OLIVE_LIGHT, + paletteGlassSaturatedBrownLight = paletteGlass + COLOUR_SATURATED_BROWN_LIGHT, + paletteGlassBordeauxRedDark = paletteGlass + COLOUR_BORDEAUX_RED_DARK, + paletteGlassBordeauxRedLight = paletteGlass + COLOUR_BORDEAUX_RED_LIGHT, + paletteGlassGrassGreenDark = paletteGlass + COLOUR_GRASS_GREEN_DARK, + paletteGlassGrassGreenLight = paletteGlass + COLOUR_GRASS_GREEN_LIGHT, + paletteGlassOliveDark = paletteGlass + COLOUR_OLIVE_DARK, + paletteGlassOliveLight = paletteGlass + COLOUR_OLIVE_LIGHT, + paletteGlassSaturatedGreenLight = paletteGlass + COLOUR_SATURATED_GREEN_LIGHT, + paletteGlassTanDark = paletteGlass + COLOUR_TAN_DARK, + paletteGlassTanLight = paletteGlass + COLOUR_TAN_LIGHT, + paletteGlassDullPurpleLight = paletteGlass + COLOUR_DULL_PURPLE_LIGHT, + paletteGlassDullGreenDark = paletteGlass + COLOUR_DULL_GREEN_DARK, + paletteGlassDullGreenLight = paletteGlass + COLOUR_DULL_GREEN_LIGHT, + paletteGlassSaturatedPurpleDark = paletteGlass + COLOUR_SATURATED_PURPLE_DARK, + paletteGlassSaturatedPurpleLight = paletteGlass + COLOUR_SATURATED_PURPLE_LIGHT, + paletteGlassOrangeLight = paletteGlass + COLOUR_ORANGE_LIGHT, + paletteGlassAquaDark = paletteGlass + COLOUR_AQUA_DARK, + paletteGlassMagentaLight = paletteGlass + COLOUR_MAGENTA_LIGHT, + paletteGlassDullBrownDark = paletteGlass + COLOUR_DULL_BROWN_DARK, + paletteGlassDullBrownLight = paletteGlass + COLOUR_DULL_BROWN_LIGHT, + paletteGlassInvisible = paletteGlass + COLOUR_INVISIBLE, + paletteGlassVoid = paletteGlass + COLOUR_VOID, }; struct TranslucentWindowPalette diff --git a/src/openrct2/interface/Chat.cpp b/src/openrct2/interface/Chat.cpp index 09c99a88ef..d3c39093ea 100644 --- a/src/openrct2/interface/Chat.cpp +++ b/src/openrct2/interface/Chat.cpp @@ -140,7 +140,7 @@ void ChatDraw(RenderTarget& rt, ColourWithFlags chatBackgroundColor) { topLeft - ScreenCoordsXY{ 0, 5 }, bottomRight + ScreenCoordsXY{ 0, 5 } }); // Background area + Textbox GfxFilterRect( rt, { topLeft - ScreenCoordsXY{ 0, 5 }, bottomRight + ScreenCoordsXY{ 0, 5 } }, - FilterPaletteID::Palette51); // Opaque grey background + FilterPaletteID::palette51); // Opaque grey background GfxFillRectInset( rt, { topLeft - ScreenCoordsXY{ 0, 5 }, bottomRight + ScreenCoordsXY{ 0, 5 } }, chatBackgroundColor, INSET_RECT_FLAG_FILL_NONE); diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index fe6279e5b3..7627514495 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -1030,7 +1030,7 @@ namespace OpenRCT2 static void ViewportPaintWeatherGloom(RenderTarget& rt) { auto paletteId = ClimateGetWeatherGloomPaletteId(getGameState().weatherCurrent); - if (paletteId != FilterPaletteID::PaletteNull) + if (paletteId != FilterPaletteID::paletteNull) { auto x = rt.x; auto y = rt.y; diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp index 8c5285047b..b15910bc84 100644 --- a/src/openrct2/paint/Paint.cpp +++ b/src/openrct2/paint/Paint.cpp @@ -846,7 +846,7 @@ static ImageId PaintPSColourifyImage(const PaintStruct* ps, ImageId imageId, uin switch (visibility) { case VisibilityKind::partial: - return imageId.WithTransparency(FilterPaletteID::PaletteDarken1); + return imageId.WithTransparency(FilterPaletteID::paletteDarken1); case VisibilityKind::hidden: return ImageId(); default: diff --git a/src/openrct2/paint/Paint.h b/src/openrct2/paint/Paint.h index ceb12e98cf..0b4756b731 100644 --- a/src/openrct2/paint/Paint.h +++ b/src/openrct2/paint/Paint.h @@ -249,8 +249,8 @@ extern CoordsXY gClipSelectionA; extern CoordsXY gClipSelectionB; /** rct2: 0x00993CC4. The white ghost that indicates not-yet-built elements. */ -constexpr ImageId ConstructionMarker = ImageId(0).WithRemap(FilterPaletteID::PaletteGhost); -constexpr ImageId HighlightMarker = ImageId(0).WithRemap(FilterPaletteID::PaletteGhost); +constexpr ImageId ConstructionMarker = ImageId(0).WithRemap(FilterPaletteID::paletteGhost); +constexpr ImageId HighlightMarker = ImageId(0).WithRemap(FilterPaletteID::paletteGhost); constexpr ImageId TrackStationColour = ImageId(0, COLOUR_BLACK); constexpr ImageId ShopSupportColour = ImageId(0, COLOUR_DARK_BROWN); diff --git a/src/openrct2/paint/VirtualFloor.cpp b/src/openrct2/paint/VirtualFloor.cpp index 4e381565bc..21ea96bc55 100644 --- a/src/openrct2/paint/VirtualFloor.cpp +++ b/src/openrct2/paint/VirtualFloor.cpp @@ -390,7 +390,7 @@ void VirtualFloorPaint(PaintSession& session) if (!weAreOccupied && !weAreLit && weAreAboveGround && weAreOwned) { - auto imageColourFlats = ImageId(SPR_G2_SURFACE_GLASSY_RECOLOURABLE, FilterPaletteID::PaletteWater).WithBlended(true); + auto imageColourFlats = ImageId(SPR_G2_SURFACE_GLASSY_RECOLOURABLE, FilterPaletteID::paletteWater).WithBlended(true); PaintAddImageAsParent( session, imageColourFlats, virtualFloorOffset, { { 2, 2, _virtualFloorHeight - 3 }, { 30, 30, 0 } }); } diff --git a/src/openrct2/paint/support/MetalSupports.cpp b/src/openrct2/paint/support/MetalSupports.cpp index 3e859d125b..ae3a77daf1 100644 --- a/src/openrct2/paint/support/MetalSupports.cpp +++ b/src/openrct2/paint/support/MetalSupports.cpp @@ -304,7 +304,7 @@ static bool MetalSupportsPaintSetupCommon( { return false; } - imageTemplate = ImageId(0).WithTransparency(FilterPaletteID::PaletteDarken1); + imageTemplate = ImageId(0).WithTransparency(FilterPaletteID::paletteDarken1); } int32_t currentHeight = height; @@ -529,7 +529,7 @@ bool PathPoleSupportsPaintSetup( { return false; } - imageTemplate = ImageId().WithTransparency(FilterPaletteID::PaletteDarken1); + imageTemplate = ImageId().WithTransparency(FilterPaletteID::paletteDarken1); } if (height < supportSegments[segment].height) diff --git a/src/openrct2/paint/support/WoodenSupports.cpp b/src/openrct2/paint/support/WoodenSupports.cpp index 3be01ea8b0..ee9efd3f81 100644 --- a/src/openrct2/paint/support/WoodenSupports.cpp +++ b/src/openrct2/paint/support/WoodenSupports.cpp @@ -418,7 +418,7 @@ static inline bool WoodenSupportsPaintSetupCommon( { return false; } - imageTemplate = ImageId().WithTransparency(FilterPaletteID::PaletteDarken1); + imageTemplate = ImageId().WithTransparency(FilterPaletteID::paletteDarken1); } baseHeight = ceil2(session.Support.height, 16); diff --git a/src/openrct2/paint/tile_element/Paint.Banner.cpp b/src/openrct2/paint/tile_element/Paint.Banner.cpp index 4d58e8dd46..ba0dbded72 100644 --- a/src/openrct2/paint/tile_element/Paint.Banner.cpp +++ b/src/openrct2/paint/tile_element/Paint.Banner.cpp @@ -104,11 +104,11 @@ void PaintBanner(PaintSession& session, uint8_t direction, int32_t height, const if (bannerElement.IsGhost()) { session.InteractionType = ViewportInteractionItem::none; - imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); + imageTemplate = ImageId().WithRemap(FilterPaletteID::paletteGhost); } else if (session.SelectedElement == reinterpret_cast(&bannerElement)) { - imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); + imageTemplate = ImageId().WithRemap(FilterPaletteID::paletteGhost); } else { diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp index 6972eab4fa..8a6e991499 100644 --- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp +++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp @@ -151,11 +151,11 @@ static void PaintRideEntranceExit(PaintSession& session, uint8_t direction, int3 if (entranceEl.IsGhost()) { session.InteractionType = ViewportInteractionItem::none; - imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); + imageTemplate = ImageId().WithRemap(FilterPaletteID::paletteGhost); } else if (session.SelectedElement == reinterpret_cast(&entranceEl)) { - imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); + imageTemplate = ImageId().WithRemap(FilterPaletteID::paletteGhost); } else { @@ -290,11 +290,11 @@ static void PaintParkEntrance(PaintSession& session, uint8_t direction, int32_t if (entranceEl.IsGhost()) { session.InteractionType = ViewportInteractionItem::none; - imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); + imageTemplate = ImageId().WithRemap(FilterPaletteID::paletteGhost); } else if (session.SelectedElement == reinterpret_cast(&entranceEl)) { - imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); + imageTemplate = ImageId().WithRemap(FilterPaletteID::paletteGhost); } auto& objManager = GetContext()->GetObjectManager(); diff --git a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp index 22a9da89ba..70273d48ca 100644 --- a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp @@ -357,18 +357,18 @@ void PaintLargeScenery(PaintSession& session, uint8_t direction, uint16_t height ImageId imageTemplate; if (gTrackDesignSaveMode && !TrackDesignSaveContainsTileElement(reinterpret_cast(&tileElement))) { - imageTemplate = ImageId().WithRemap(FilterPaletteID::Palette46); + imageTemplate = ImageId().WithRemap(FilterPaletteID::palette46); isGhost = true; } else if (tileElement.IsGhost()) { session.InteractionType = ViewportInteractionItem::none; - imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); + imageTemplate = ImageId().WithRemap(FilterPaletteID::paletteGhost); isGhost = true; } else if (session.SelectedElement == reinterpret_cast(&tileElement)) { - imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); + imageTemplate = ImageId().WithRemap(FilterPaletteID::paletteGhost); isGhost = true; } else diff --git a/src/openrct2/paint/tile_element/Paint.Path.cpp b/src/openrct2/paint/tile_element/Paint.Path.cpp index d2985c501b..c17f4a47c5 100644 --- a/src/openrct2/paint/tile_element/Paint.Path.cpp +++ b/src/openrct2/paint/tile_element/Paint.Path.cpp @@ -790,41 +790,41 @@ void PaintPath(PaintSession& session, uint16_t height, const PathElement& tileEl if (!TrackDesignSaveContainsTileElement(reinterpret_cast(&tileElement))) { - imageTemplate = ImageId().WithRemap(FilterPaletteID::Palette46); + imageTemplate = ImageId().WithRemap(FilterPaletteID::palette46); } } if (session.ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) { - imageTemplate = ImageId().WithRemap(FilterPaletteID::Palette46); + imageTemplate = ImageId().WithRemap(FilterPaletteID::palette46); } if (tileElement.AdditionIsGhost()) { - sceneryImageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); + sceneryImageTemplate = ImageId().WithRemap(FilterPaletteID::paletteGhost); } if (tileElement.IsGhost()) { session.InteractionType = ViewportInteractionItem::none; - imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); + imageTemplate = ImageId().WithRemap(FilterPaletteID::paletteGhost); } else if (session.SelectedElement == reinterpret_cast(&tileElement)) { - imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); - sceneryImageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); + imageTemplate = ImageId().WithRemap(FilterPaletteID::paletteGhost); + sceneryImageTemplate = ImageId().WithRemap(FilterPaletteID::paletteGhost); } // For debugging purpose, show blocked tiles with a colour if (gPaintBlockedTiles && tileElement.IsBlockedByVehicle()) { - imageTemplate = ImageId().WithRemap(FilterPaletteID::Palette46); + imageTemplate = ImageId().WithRemap(FilterPaletteID::palette46); } // Draw wide flags as ghosts, leaving only the "walkable" paths to be drawn normally if (gPaintWidePathsAsGhost && tileElement.IsWide()) { - imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); + imageTemplate = ImageId().WithRemap(FilterPaletteID::paletteGhost); } PaintPatrolAreas(session, tileElement); diff --git a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp index b7bf7bbe78..fab527f1a1 100644 --- a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp @@ -345,17 +345,17 @@ void PaintSmallScenery(PaintSession& session, uint8_t direction, int32_t height, { if (!TrackDesignSaveContainsTileElement(reinterpret_cast(&sceneryElement))) { - imageTemplate = ImageId().WithRemap(FilterPaletteID::Palette46); + imageTemplate = ImageId().WithRemap(FilterPaletteID::palette46); } } if (sceneryElement.IsGhost()) { session.InteractionType = ViewportInteractionItem::none; - imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); + imageTemplate = ImageId().WithRemap(FilterPaletteID::paletteGhost); } else if (session.SelectedElement == reinterpret_cast(&sceneryElement)) { - imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); + imageTemplate = ImageId().WithRemap(FilterPaletteID::paletteGhost); } PaintSmallSceneryBody(session, direction, height, sceneryElement, sceneryEntry, imageTemplate); diff --git a/src/openrct2/paint/tile_element/Paint.Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp index 6c58d7ef2d..76f46d1df6 100644 --- a/src/openrct2/paint/tile_element/Paint.Surface.cpp +++ b/src/openrct2/paint/tile_element/Paint.Surface.cpp @@ -1043,12 +1043,12 @@ void PaintSurface(PaintSession& session, uint8_t direction, uint16_t height, con } if (session.ViewFlags & (VIEWPORT_FLAG_UNDERGROUND_INSIDE | VIEWPORT_FLAG_HIDE_BASE)) { - imageId = imageId.WithTransparency(FilterPaletteID::PaletteDarken1); + imageId = imageId.WithTransparency(FilterPaletteID::paletteDarken1); } if (session.SelectedElement == elementPtr) { - imageId = imageId.WithRemap(FilterPaletteID::PaletteGhost); + imageId = imageId.WithRemap(FilterPaletteID::paletteGhost); } PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 32, -1 }); @@ -1104,7 +1104,7 @@ void PaintSurface(PaintSession& session, uint8_t direction, uint16_t height, con // Loc661089: const auto fpId = static_cast( (((EnumValue(mapSelectionType) - EnumValue(MapSelectType::edge0) + 1) + rotation) & 3) - + static_cast(FilterPaletteID::PaletteLandMarker0)); + + static_cast(FilterPaletteID::paletteLandMarker0)); const auto image_id = ImageId(SPR_TERRAIN_SELECTION_EDGE + Byte97B444[surfaceShape], fpId); PaintAttachToPreviousPS(session, image_id, 0, 0); } @@ -1114,7 +1114,7 @@ void PaintSurface(PaintSession& session, uint8_t direction, uint16_t height, con // Selection split into four quarter segments const auto fpId = static_cast( (((EnumValue(mapSelectionType) - EnumValue(MapSelectType::quarter0)) + rotation) & 3) - + static_cast(FilterPaletteID::PaletteQuarterMarker0)); + + static_cast(FilterPaletteID::paletteQuarterMarker0)); const auto image_id = ImageId(SPR_TERRAIN_SELECTION_QUARTER + Byte97B444[surfaceShape], fpId); PaintAttachToPreviousPS(session, image_id, 0, 0); } @@ -1128,7 +1128,7 @@ void PaintSurface(PaintSession& session, uint8_t direction, uint16_t height, con } const auto fpId = static_cast( - eax + static_cast(FilterPaletteID::PaletteLandMarker0)); + eax + static_cast(FilterPaletteID::paletteLandMarker0)); const auto image_id = ImageId(SPR_TERRAIN_SELECTION_CORNER + Byte97B444[surfaceShape], fpId); PaintAttachToPreviousPS(session, image_id, 0, 0); } @@ -1136,7 +1136,7 @@ void PaintSurface(PaintSession& session, uint8_t direction, uint16_t height, con { auto [waterHeight, waterSurfaceShape] = SurfaceGetHeightAboveWater(tileElement, height, surfaceShape); - const auto fpId = FilterPaletteID::PaletteGlassLightPurple; + const auto fpId = FilterPaletteID::paletteGlassLightPurple; const auto imageId1 = ImageId(SPR_TERRAIN_SELECTION_CORNER + Byte97B444[surfaceShape], fpId); PaintAttachToPreviousPS(session, imageId1, 0, 0); @@ -1154,7 +1154,7 @@ void PaintSurface(PaintSession& session, uint8_t direction, uint16_t height, con // The water tool should draw its grid _on_ the water, rather than on the surface under water. auto [local_height, local_surfaceShape] = SurfaceGetHeightAboveWater(tileElement, height, surfaceShape); - const auto fpId = FilterPaletteID::PaletteWaterMarker; + const auto fpId = FilterPaletteID::paletteWaterMarker; const auto image_id = ImageId(SPR_TERRAIN_SELECTION_CORNER + Byte97B444[local_surfaceShape], fpId); PaintStruct* backup = session.LastPS; @@ -1175,10 +1175,10 @@ void PaintSurface(PaintSession& session, uint8_t direction, uint16_t height, con continue; } - FilterPaletteID fpId = FilterPaletteID::PaletteSceneryGroundMarker; + FilterPaletteID fpId = FilterPaletteID::paletteSceneryGroundMarker; if (gMapSelectFlags.has(MapSelectFlag::green)) { - fpId = FilterPaletteID::PaletteRideGroundMarker; + fpId = FilterPaletteID::paletteRideGroundMarker; } const auto image_id = ImageId(SPR_TERRAIN_SELECTION_CORNER + Byte97B444[surfaceShape], fpId); @@ -1247,7 +1247,7 @@ void PaintSurface(PaintSession& session, uint8_t direction, uint16_t height, con image_offset = Byte97B740[surfaceShape & 0xF]; } - const auto image_id = ImageId(SPR_WATER_MASK + image_offset, FilterPaletteID::PaletteWater).WithBlended(true); + const auto image_id = ImageId(SPR_WATER_MASK + image_offset, FilterPaletteID::paletteWater).WithBlended(true); PaintAddImageAsParent(session, image_id, { 0, 0, waterHeight }, { 32, 32, -1 }); const uint32_t overlayStart = waterIsTransparent ? EnumValue(SPR_WATER_OVERLAY) diff --git a/src/openrct2/paint/tile_element/Paint.TileElement.cpp b/src/openrct2/paint/tile_element/Paint.TileElement.cpp index dcfef2233e..cd88e9d559 100644 --- a/src/openrct2/paint/tile_element/Paint.TileElement.cpp +++ b/src/openrct2/paint/tile_element/Paint.TileElement.cpp @@ -320,13 +320,13 @@ static void PaintTileElementBase(PaintSession& session, const CoordsXY& origCoor for (std::size_t sx = 0; sx < std::size(segmentPositions[sy]); sx++) { uint16_t segmentHeight = session.SupportSegments[segmentPositions[sy][sx]].height; - auto imageColourFlats = ImageId(SPR_LAND_TOOL_SIZE_1).WithTransparency(FilterPaletteID::PaletteGlassBlack); + auto imageColourFlats = ImageId(SPR_LAND_TOOL_SIZE_1).WithTransparency(FilterPaletteID::paletteGlassBlack); if (segmentHeight == 0xFFFF) { segmentHeight = session.Support.height; // white: 0b101101 imageColourFlats = ImageId(SPR_LAND_TOOL_SIZE_1) - .WithTransparency(FilterPaletteID::PaletteTranslucentBordeauxRedHighlight); + .WithTransparency(FilterPaletteID::paletteTranslucentBordeauxRedHighlight); } // Only draw supports below the clipping height. diff --git a/src/openrct2/paint/tile_element/Paint.Wall.cpp b/src/openrct2/paint/tile_element/Paint.Wall.cpp index 639bd5cd82..c9a94f154f 100644 --- a/src/openrct2/paint/tile_element/Paint.Wall.cpp +++ b/src/openrct2/paint/tile_element/Paint.Wall.cpp @@ -337,7 +337,7 @@ void PaintWall(PaintSession& session, uint8_t direction, int32_t height, const W { if (!TrackDesignSaveContainsTileElement(reinterpret_cast(&wallElement))) { - imageTemplate = ImageId().WithRemap(FilterPaletteID::Palette46); + imageTemplate = ImageId().WithRemap(FilterPaletteID::palette46); isGhost = true; } } @@ -345,12 +345,12 @@ void PaintWall(PaintSession& session, uint8_t direction, int32_t height, const W if (wallElement.IsGhost()) { session.InteractionType = ViewportInteractionItem::none; - imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); + imageTemplate = ImageId().WithRemap(FilterPaletteID::paletteGhost); isGhost = true; } else if (session.SelectedElement == reinterpret_cast(&wallElement)) { - imageTemplate = ImageId().WithRemap(FilterPaletteID::PaletteGhost); + imageTemplate = ImageId().WithRemap(FilterPaletteID::paletteGhost); isGhost = true; } diff --git a/src/openrct2/paint/track/coaster/WoodenRollerCoaster.cpp b/src/openrct2/paint/track/coaster/WoodenRollerCoaster.cpp index 51c9fad60a..19b12ce1c6 100644 --- a/src/openrct2/paint/track/coaster/WoodenRollerCoaster.cpp +++ b/src/openrct2/paint/track/coaster/WoodenRollerCoaster.cpp @@ -6577,7 +6577,7 @@ static void WoodenRCTrackWaterSplash( const TrackElement& trackElement, SupportType supportType) { const bool transparent = Config::Get().general.TransparentWater || (session.ViewFlags & VIEWPORT_FLAG_UNDERGROUND_INSIDE); - const auto waterMask = ImageId(SPR_WATER_MASK).WithRemap(FilterPaletteID::PaletteWater).WithBlended(true); + const auto waterMask = ImageId(SPR_WATER_MASK).WithRemap(FilterPaletteID::paletteWater).WithBlended(true); const auto waterOverlay = ImageId(transparent ? EnumValue(SPR_WATER_OVERLAY) : EnumValue(SPR_G2_OPAQUE_WATER_OVERLAY)); switch (trackSequence) diff --git a/src/openrct2/paint/track/gentle/Dodgems.cpp b/src/openrct2/paint/track/gentle/Dodgems.cpp index b79c237ea7..09b2d67ea2 100644 --- a/src/openrct2/paint/track/gentle/Dodgems.cpp +++ b/src/openrct2/paint/track/gentle/Dodgems.cpp @@ -42,7 +42,7 @@ static void PaintDodgemsRoof(PaintSession& session, int32_t height, int32_t offs auto imageId = session.TrackColours.WithIndex((SprDodgemsRoofFrame + offset)); PaintAddImageAsParent(session, imageId, { 0, 0, height }, { 32, 32, 2 }); - imageId = ImageId(SprDodgemsRoofGlass + offset).WithTransparency(FilterPaletteID::PaletteDarken3); + imageId = ImageId(SprDodgemsRoofGlass + offset).WithTransparency(FilterPaletteID::paletteDarken3); PaintAttachToPreviousPS(session, imageId, 0, 0); } diff --git a/src/openrct2/paint/track/transport/MiniatureRailway.cpp b/src/openrct2/paint/track/transport/MiniatureRailway.cpp index c556aa07a3..df10fd4b4f 100644 --- a/src/openrct2/paint/track/transport/MiniatureRailway.cpp +++ b/src/openrct2/paint/track/transport/MiniatureRailway.cpp @@ -664,7 +664,7 @@ static void PaintMiniatureRailwayTrackFlat( imageIdAlt = MiniatureRailwayTrackToGroovedIndent( session.PathElementOnSameHeight, direction, session.CurrentRotation); PaintAddImageAsChildRotated( - session, direction, imageIdAlt.WithTransparency(FilterPaletteID::PaletteDarken2), { 0, 6, height }, + session, direction, imageIdAlt.WithTransparency(FilterPaletteID::paletteDarken2), { 0, 6, height }, { { 0, 6, height + 2 }, { 32, 20, 2 } }); } } @@ -688,7 +688,7 @@ static void PaintMiniatureRailwayTrackFlat( imageIdAlt = MiniatureRailwayTrackToGroovedIndent( session.PathElementOnSameHeight, direction, session.CurrentRotation); PaintAddImageAsParentRotated( - session, direction, imageIdAlt.WithTransparency(FilterPaletteID::PaletteDarken2), { 0, 6, height }, + session, direction, imageIdAlt.WithTransparency(FilterPaletteID::paletteDarken2), { 0, 6, height }, { { 0, 6, height + 2 }, { 32, 20, 2 } }); } } diff --git a/src/openrct2/paint/vehicle/Vehicle.ObservationTower.cpp b/src/openrct2/paint/vehicle/Vehicle.ObservationTower.cpp index 7830ca5ea0..ee4e07e333 100644 --- a/src/openrct2/paint/vehicle/Vehicle.ObservationTower.cpp +++ b/src/openrct2/paint/vehicle/Vehicle.ObservationTower.cpp @@ -62,8 +62,8 @@ namespace OpenRCT2 auto imageId1 = ImageId(baseImageId + 1, vehicle->colours.Body, vehicle->colours.Trim, vehicle->colours.Tertiary); if (vehicle->IsGhost()) { - imageId0 = ImageId(baseImageId + 0).WithRemap(FilterPaletteID::PaletteGhost); - imageId1 = ImageId(baseImageId + 1).WithRemap(FilterPaletteID::PaletteGhost); + imageId0 = ImageId(baseImageId + 0).WithRemap(FilterPaletteID::paletteGhost); + imageId1 = ImageId(baseImageId + 1).WithRemap(FilterPaletteID::paletteGhost); } PaintAddImageAsParent(session, imageId0, { 0, 0, z }, { { -11, -11, z + 1 }, { 2, 2, 41 } }); diff --git a/src/openrct2/paint/vehicle/Vehicle.Submarine.cpp b/src/openrct2/paint/vehicle/Vehicle.Submarine.cpp index 9267b3e0bb..483a078625 100644 --- a/src/openrct2/paint/vehicle/Vehicle.Submarine.cpp +++ b/src/openrct2/paint/vehicle/Vehicle.Submarine.cpp @@ -51,8 +51,8 @@ namespace OpenRCT2 auto imageId1 = ImageId(baseImageId + 1, vehicle->colours.Body, vehicle->colours.Trim, vehicle->colours.Tertiary); if (vehicle->IsGhost()) { - imageId0 = ImageId(baseImageId + 0).WithRemap(FilterPaletteID::PaletteGhost); - imageId1 = ImageId(baseImageId + 1).WithRemap(FilterPaletteID::PaletteGhost); + imageId0 = ImageId(baseImageId + 0).WithRemap(FilterPaletteID::paletteGhost); + imageId1 = ImageId(baseImageId + 1).WithRemap(FilterPaletteID::paletteGhost); } const auto& bb = VehicleBoundboxes[carEntry->draw_order][OpenRCT2::Entity::Yaw::YawTo16(imageDirection)]; diff --git a/src/openrct2/paint/vehicle/VehiclePaint.cpp b/src/openrct2/paint/vehicle/VehiclePaint.cpp index bd06dcf69f..3bd6dc3ab0 100644 --- a/src/openrct2/paint/vehicle/VehiclePaint.cpp +++ b/src/openrct2/paint/vehicle/VehiclePaint.cpp @@ -1091,7 +1091,7 @@ static void PaintVehicleRiders( auto imageId = ImageId(offsetImageId, peepColour0, peepColour1); if (vehicle->IsGhost()) { - imageId = ImageId(offsetImageId).WithRemap(FilterPaletteID::PaletteGhost); + imageId = ImageId(offsetImageId).WithRemap(FilterPaletteID::paletteGhost); } PaintAddImageAsChild( @@ -1125,7 +1125,7 @@ static void vehicle_sprite_paint( auto imageId = ImageId(baseImageId, vehicle->colours.Body, vehicle->colours.Trim, vehicle->colours.Tertiary); if (vehicle->IsGhost()) { - imageId = ImageId(baseImageId).WithRemap(FilterPaletteID::PaletteGhost); + imageId = ImageId(baseImageId).WithRemap(FilterPaletteID::paletteGhost); } PaintAddImageAsParent( session, imageId, { 0, 0, z }, diff --git a/src/openrct2/world/Climate.cpp b/src/openrct2/world/Climate.cpp index d1357307ee..02917f6676 100644 --- a/src/openrct2/world/Climate.cpp +++ b/src/openrct2/world/Climate.cpp @@ -81,10 +81,10 @@ static int32_t _thunderStereoEcho = 0; static std::shared_ptr _weatherSoundChannel; constexpr FilterPaletteID kClimateWeatherGloomColours[4] = { - FilterPaletteID::PaletteNull, - FilterPaletteID::PaletteDarken1, - FilterPaletteID::PaletteDarken2, - FilterPaletteID::PaletteDarken3, + FilterPaletteID::paletteNull, + FilterPaletteID::paletteDarken1, + FilterPaletteID::paletteDarken2, + FilterPaletteID::paletteDarken3, }; static int8_t ClimateStepWeatherLevel(int8_t currentWeatherLevel, int8_t nextWeatherLevel); @@ -303,7 +303,7 @@ bool ClimateHasWeatherEffect() FilterPaletteID ClimateGetWeatherGloomPaletteId(const WeatherState& state) { - auto paletteId = FilterPaletteID::PaletteNull; + auto paletteId = FilterPaletteID::paletteNull; auto gloom = state.weatherGloom; if (gloom < std::size(kClimateWeatherGloomColours)) {