PublicArchive/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2026-05-06 07:56:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25868 from Gymnasiast/refactor/colour-h

Browse Source 
Remove more stuff from Colour.h
This commit is contained in:
Michael Steenbeek
2026-01-24 18:33:41 +01:00
committed by GitHub
parent 182b5c65dd 27b5c8d44e
commit fa72aaf6b2
34 changed files with 90 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/openrct2-ui/UiStringIds.h
+3 -3
View File
@@ -64,8 +64,8 @@ namespace OpenRCT2
STR_WHITE_STRING = 5139,
// Colour dropdown tooltips
STR_COLOUR_AQUAMARINE_TIP = 5526,
STR_COLOUR_AQUA_DARK_TIP = 6569,
STR_COLOUR_LIGHT_WATER_TIP = 5526,
STR_COLOUR_DEEP_WATER_TIP = 6569,
STR_COLOUR_BLACK_TIP = 5516,
STR_COLOUR_BORDEAUX_RED_DARK_TIP = 6554,
STR_COLOUR_BORDEAUX_RED_LIGHT_TIP = 6555,
@@ -116,7 +116,7 @@ namespace OpenRCT2
STR_COLOUR_SATURATED_RED_TIP = 5543,
STR_COLOUR_TAN_DARK_TIP = 6561,
STR_COLOUR_TAN_LIGHT_TIP = 6562,
STR_COLOUR_TEAL_TIP = 5525,
STR_COLOUR_DARK_WATER_TIP = 5525,
STR_COLOUR_VOID_TIP = 6574,
STR_COLOUR_WHITE_TIP = 5518,
STR_COLOUR_YELLOW_TIP = 5534,
src/openrct2-ui/interface/InGameConsole.cpp
+3 -3
View File
@@ -344,7 +344,7 @@ void InGameConsole::Draw(RenderTarget& rt) const
if (textColour.colour == COLOUR_BLACK)
{
DrawText(rt, screenCoords, { textColour, style }, "{BLACK}");
DrawText(rt, screenCoords, { kTextColour255, style }, _consoleLines[index].first.c_str(), true);
DrawText(rt, screenCoords, { COLOUR_NULL, style }, _consoleLines[index].first.c_str(), true);
}
else
{
@@ -355,7 +355,7 @@ void InGameConsole::Draw(RenderTarget& rt) const
{
std::string lineColour = FormatTokenToStringWithBraces(_consoleLines[index].second);
DrawText(rt, screenCoords, { textColour, style }, lineColour.c_str());
DrawText(rt, screenCoords, { kTextColour255, style }, _consoleLines[index].first.c_str(), true);
DrawText(rt, screenCoords, { COLOUR_NULL, style }, _consoleLines[index].first.c_str(), true);
}
screenCoords.y += lineHeight;
@@ -367,7 +367,7 @@ void InGameConsole::Draw(RenderTarget& rt) const
if (textColour.colour == COLOUR_BLACK)
{
DrawText(rt, screenCoords, { textColour, style }, "{BLACK}");
DrawText(rt, screenCoords, { kTextColour255, style }, _consoleCurrentLine.c_str(), true);
DrawText(rt, screenCoords, { COLOUR_NULL, style }, _consoleCurrentLine.c_str(), true);
}
else
{
src/openrct2-ui/windows/About.cpp
+2 -2
View File
@@ -165,14 +165,14 @@ namespace OpenRCT2::Ui::Windows
ft.Add<StringId>(STR_TITLE_SEQUENCE_OPENRCT2);
DrawTextWrapped(
rt, aboutOpenRCT2Coords, 87, STR_WINDOW_COLOUR_2_STRINGID, ft,
{ COLOUR_AQUAMARINE, TextAlignment::centre });
{ COLOUR_LIGHT_WATER, TextAlignment::centre });
}
{
// TODO: this string shouldn't be reused for this tab
auto ft = Formatter();
ft.Add<StringId>(STR_TITLE_SEQUENCE_RCT2);
DrawTextWrapped(
rt, aboutRCT2Coords, 87, STR_WINDOW_COLOUR_2_STRINGID, ft, { COLOUR_AQUAMARINE, TextAlignment::centre });
rt, aboutRCT2Coords, 87, STR_WINDOW_COLOUR_2_STRINGID, ft, { COLOUR_LIGHT_WATER, TextAlignment::centre });
}
int32_t newHeight = 0;
src/openrct2-ui/windows/Dropdown.cpp
+6 -6
View File
@@ -479,7 +479,7 @@ namespace OpenRCT2::Ui::Windows
COLOUR_DARK_YELLOW,
COLOUR_GRASS_GREEN_DARK,
COLOUR_SATURATED_GREEN,
COLOUR_AQUA_DARK,
COLOUR_DEEP_WATER,
COLOUR_DARK_BLUE,
COLOUR_SATURATED_PURPLE_DARK,
@@ -489,7 +489,7 @@ namespace OpenRCT2::Ui::Windows
COLOUR_YELLOW,
COLOUR_MOSS_GREEN,
COLOUR_BRIGHT_GREEN,
COLOUR_TEAL,
COLOUR_DARK_WATER,
COLOUR_LIGHT_BLUE,
COLOUR_BRIGHT_PURPLE,
@@ -499,7 +499,7 @@ namespace OpenRCT2::Ui::Windows
COLOUR_BRIGHT_YELLOW,
COLOUR_GRASS_GREEN_LIGHT,
COLOUR_SATURATED_GREEN_LIGHT,
COLOUR_AQUAMARINE,
COLOUR_LIGHT_WATER,
COLOUR_ICY_BLUE,
COLOUR_SATURATED_PURPLE_LIGHT,
@@ -544,7 +544,7 @@ namespace OpenRCT2::Ui::Windows
STR_COLOUR_DARK_YELLOW_TIP,
STR_COLOUR_GRASS_GREEN_DARK_TIP,
STR_COLOUR_SATURATED_GREEN_TIP,
STR_COLOUR_AQUA_DARK_TIP,
STR_COLOUR_DEEP_WATER_TIP,
STR_COLOUR_DARK_BLUE_TIP,
STR_COLOUR_SATURATED_PURPLE_DARK_TIP,
@@ -554,7 +554,7 @@ namespace OpenRCT2::Ui::Windows
STR_COLOUR_YELLOW_TIP,
STR_COLOUR_MOSS_GREEN_TIP,
STR_COLOUR_BRIGHT_GREEN_TIP,
STR_COLOUR_TEAL_TIP,
STR_COLOUR_DARK_WATER_TIP,
STR_COLOUR_LIGHT_BLUE_TIP,
STR_COLOUR_BRIGHT_PURPLE_TIP,
@@ -564,7 +564,7 @@ namespace OpenRCT2::Ui::Windows
STR_COLOUR_BRIGHT_YELLOW_TIP,
STR_COLOUR_GRASS_GREEN_LIGHT_TIP,
STR_COLOUR_SATURATED_GREEN_LIGHT_TIP,
STR_COLOUR_AQUAMARINE_TIP,
STR_COLOUR_LIGHT_WATER_TIP,
STR_COLOUR_ICY_BLUE_TIP,
STR_COLOUR_SATURATED_PURPLE_LIGHT_TIP,
src/openrct2-ui/windows/Park.cpp
+1 -1
View File
@@ -1244,7 +1244,7 @@ namespace OpenRCT2::Ui::Windows
auto* animObj = findPeepAnimationsObjectForType(AnimationPeepType::guest);
ImageId peepImage(
animObj->GetPeepAnimation(PeepAnimationGroup::normal).baseImage + 1, COLOUR_BRIGHT_RED, COLOUR_TEAL);
animObj->GetPeepAnimation(PeepAnimationGroup::normal).baseImage + 1, COLOUR_BRIGHT_RED, COLOUR_DARK_WATER);
if (page == WINDOW_PARK_PAGE_GUESTS)
peepImage = peepImage.WithIndexOffset(_peepAnimationFrame & 0xFFFFFFFC);
src/openrct2-ui/windows/Ride.cpp
+1 -1
View File
@@ -1333,7 +1333,7 @@ namespace OpenRCT2::Ui::Windows
spriteIndex += animObj->GetPeepAnimation(PeepAnimationGroup::normal).baseImage + 1;
GfxDrawSprite(
rt, ImageId(spriteIndex, COLOUR_BRIGHT_RED, COLOUR_TEAL),
rt, ImageId(spriteIndex, COLOUR_BRIGHT_RED, COLOUR_DARK_WATER),
windowPos + ScreenCoordsXY{ widget.midX(), widget.bottom - 6 });
}
}
src/openrct2-ui/windows/ScenarioSelect.cpp
+1 -1
View File
@@ -327,7 +327,7 @@ namespace OpenRCT2::Ui::Windows
ft.Add<StringId>(kScenarioOriginStringIds[i]);
auto stringCoords = windowPos + ScreenCoordsXY{ widget.midX(), widget.midY() - 3 };
DrawTextWrapped(rt, stringCoords, 87, format, ft, { COLOUR_AQUAMARINE, fontStyle, TextAlignment::centre });
DrawTextWrapped(rt, stringCoords, 87, format, ft, { COLOUR_LIGHT_WATER, fontStyle, TextAlignment::centre });
}
auto previewPaneWidth = GetPreviewPaneWidth();
src/openrct2/drawing/Drawing.Sprite.cpp
+2
View File
@@ -33,6 +33,8 @@ using namespace OpenRCT2;
using namespace OpenRCT2::Drawing;
using namespace OpenRCT2::Ui;
static constexpr uint8_t kPaletteLengthRemap = 12;
/**
* 12 elements from 0xF3 are the peep top colour, 12 elements from 0xCA are peep trouser colour
*
src/openrct2/drawing/Drawing.String.cpp
+3 -3
View File
@@ -331,7 +331,7 @@ void DrawStringCentredRaw(
for (int32_t i = 0; i <= numLines; i++)
{
int32_t width = GfxGetStringWidth(text, fontStyle);
DrawText(rt, screenCoords - ScreenCoordsXY{ width / 2, 0 }, { kTextColour254, fontStyle }, text);
DrawText(rt, screenCoords - ScreenCoordsXY{ width / 2, 0 }, { COLOUR_NULL, fontStyle }, text);
const utf8* ch = text;
const utf8* nextCh = nullptr;
@@ -462,7 +462,7 @@ void DrawNewsTicker(
}
screenCoords = { coords.x - halfWidth, lineY };
DrawText(rt, screenCoords, { kTextColour254, FontStyle::small }, buffer);
DrawText(rt, screenCoords, { COLOUR_NULL, FontStyle::small }, buffer);
if (numCharactersDrawn > numCharactersToDraw)
{
@@ -749,7 +749,7 @@ static void TTFProcessString(RenderTarget& rt, std::string_view text, TextDrawIn
static void TTFProcessInitialColour(ColourWithFlags colour, TextDrawInfo* info)
{
if (colour.colour != kTextColour254 && colour.colour != kTextColour255)
if (colour.colour != COLOUR_NULL)
{
info->colourFlags = colour.flags;
if (!colour.flags.has(ColourFlag::inset))
src/openrct2/drawing/Drawing.cpp
+12 -3
View File
@@ -34,6 +34,15 @@
using namespace OpenRCT2;
using namespace OpenRCT2::Drawing;
static constexpr auto kPaletteOffsetDynamic = PaletteIndex::pi10;
static constexpr uint8_t kPaletteLengthDynamic = 236;
static constexpr uint8_t kPaletteLengthWaterWaves = 5;
static constexpr uint8_t kPaletteLengthWaterSparkles = 5;
static constexpr auto kPaletteOffsetAnimated = PaletteIndex::waterWaves0;
static constexpr uint8_t kPaletteLengthAnimated = 16;
static auto _defaultPaletteMapping = []() {
std::array<PaletteIndex, 256> res;
for (size_t i = 0; i < std::size(res); i++)
@@ -583,8 +592,8 @@ const TranslucentWindowPalette kTranslucentWindowPalettes[COLOUR_COUNT] = {
kWindowPaletteLightBlue, // COLOUR_DARK_BLUE
kWindowPaletteLightBlue, // COLOUR_LIGHT_BLUE
kWindowPaletteLightBlue, // COLOUR_ICY_BLUE
kWindowPaletteTeal, // COLOUR_TEAL
kWindowPaletteTeal, // COLOUR_AQUAMARINE
kWindowPaletteTeal, // COLOUR_DARK_WATER
kWindowPaletteTeal, // COLOUR_LIGHT_WATER
kWindowPaletteBrightGreen, // COLOUR_SATURATED_GREEN
kWindowPaletteDarkGreen, // COLOUR_DARK_GREEN
kWindowPaletteMossGreen, // COLOUR_MOSS_GREEN
@@ -624,7 +633,7 @@ const TranslucentWindowPalette kTranslucentWindowPalettes[COLOUR_COUNT] = {
kWindowPaletteBrightPurple, // COLOUR_SATURATED_PURPLE_DARK
kWindowPaletteBrightPurple, // COLOUR_SATURATED_PURPLE_LIGHT
kWindowPaletteLightOrange, // COLOUR_ORANGE_LIGHT
kWindowPaletteTeal, // COLOUR_AQUA_DARK
kWindowPaletteTeal, // COLOUR_DEEP_WATER
kWindowPaletteBrightPink, // COLOUR_MAGENTA_LIGHT
kWindowPaletteDarkBrown, // COLOUR_DULL_BROWN_DARK
kWindowPaletteDarkBrown, // COLOUR_DULL_BROWN_LIGHT
src/openrct2/drawing/FilterPaletteIds.h
+3 -3
View File
@@ -109,8 +109,8 @@ namespace OpenRCT2::Drawing
paletteGlassDarkBlue = paletteGlass + COLOUR_DARK_BLUE,
paletteGlassLightBlue = paletteGlass + COLOUR_LIGHT_BLUE,
paletteGlassIcyBlue = paletteGlass + COLOUR_ICY_BLUE,
paletteGlassTeal = paletteGlass + COLOUR_TEAL,
paletteGlassAquamarine = paletteGlass + COLOUR_AQUAMARINE,
paletteGlassTeal = paletteGlass + COLOUR_DARK_WATER,
paletteGlassAquamarine = paletteGlass + COLOUR_LIGHT_WATER,
paletteGlassSaturatedGreen = paletteGlass + COLOUR_SATURATED_GREEN,
paletteGlassDarkGreen = paletteGlass + COLOUR_DARK_GREEN,
paletteGlassMossGreen = paletteGlass + COLOUR_MOSS_GREEN,
@@ -150,7 +150,7 @@ namespace OpenRCT2::Drawing
paletteGlassSaturatedPurpleDark = paletteGlass + COLOUR_SATURATED_PURPLE_DARK,
paletteGlassSaturatedPurpleLight = paletteGlass + COLOUR_SATURATED_PURPLE_LIGHT,
paletteGlassOrangeLight = paletteGlass + COLOUR_ORANGE_LIGHT,
paletteGlassAquaDark = paletteGlass + COLOUR_AQUA_DARK,
paletteGlassAquaDark = paletteGlass + COLOUR_DEEP_WATER,
paletteGlassMagentaLight = paletteGlass + COLOUR_MAGENTA_LIGHT,
paletteGlassDullBrownDark = paletteGlass + COLOUR_DULL_BROWN_DARK,
paletteGlassDullBrownLight = paletteGlass + COLOUR_DULL_BROWN_LIGHT,
src/openrct2/drawing/Text.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ public:
for (int32_t line = 0; line < LineCount; ++line)
{
DrawText(rt, lineCoords, tempPaint, buffer);
tempPaint.Colour = kTextColour254;
tempPaint.Colour = COLOUR_NULL;
buffer = GetStringEnd(buffer) + 1;
lineCoords.y += LineHeight;
}
src/openrct2/drawing/TextColour.h
+11 -1
View File
@@ -1,7 +1,17 @@
/*****************************************************************************
* Copyright (c) 2014-2026 OpenRCT2 developers
*
* For a complete list of all authors, please refer to contributors.md
* Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
*
* OpenRCT2 is licensed under the GNU General Public License version 3.
*****************************************************************************/
#pragma once
#include "../interface/Colour.h"
#include "PaletteIndex.h"
#include <cstddef>
#include <cstdint>
namespace OpenRCT2::Drawing
src/openrct2/entity/Guest.cpp
+3 -3
View File
@@ -7153,7 +7153,7 @@ static constexpr uint8_t kTrouserColours[] = {
COLOUR_BORDEAUX_RED,
COLOUR_DARK_OLIVE_DARK,
COLOUR_OLIVE_DARK,
COLOUR_AQUA_DARK,
COLOUR_DEEP_WATER,
COLOUR_DULL_BROWN_DARK,
};
@@ -7181,7 +7181,7 @@ static constexpr uint8_t kTshirtColours[] = {
COLOUR_WHITE,
COLOUR_BRIGHT_PURPLE,
COLOUR_LIGHT_BLUE,
COLOUR_TEAL,
COLOUR_DARK_WATER,
COLOUR_DARK_GREEN,
COLOUR_MOSS_GREEN,
COLOUR_BRIGHT_GREEN,
@@ -7210,7 +7210,7 @@ static constexpr uint8_t kTshirtColours[] = {
COLOUR_SATURATED_PURPLE_DARK,
COLOUR_SATURATED_PURPLE_LIGHT,
COLOUR_ORANGE_LIGHT,
COLOUR_AQUA_DARK,
COLOUR_DEEP_WATER,
COLOUR_MAGENTA_LIGHT,
COLOUR_DULL_BROWN_DARK,
COLOUR_DULL_BROWN_LIGHT,
src/openrct2/interface/Chat.cpp
+2 -2
View File
@@ -195,7 +195,7 @@ void ChatDraw(RenderTarget& rt, ColourWithFlags chatBackgroundColor)
auto ft = Formatter();
ft.Add<const char*>(lineCh);
inputLineHeight = DrawTextWrapped(
rt, screenCoords + ScreenCoordsXY{ 0, 3 }, _chatWidth - 10, STR_STRING, ft, { kTextColour255 });
rt, screenCoords + ScreenCoordsXY{ 0, 3 }, _chatWidth - 10, STR_STRING, ft, { COLOUR_NULL });
GfxSetDirtyBlocks({ screenCoords, { screenCoords + ScreenCoordsXY{ _chatWidth, inputLineHeight + 15 } } });
// TODO: Show caret if the input text has multiple lines
@@ -306,7 +306,7 @@ static int32_t ChatHistoryDrawString(RenderTarget& rt, const char* text, const S
int32_t lineY = screenCoords.y;
for (int32_t line = 0; line <= numLines; ++line)
{
DrawText(rt, { screenCoords.x, lineY - (numLines * lineHeight) }, { kTextColour254 }, bufferPtr);
DrawText(rt, { screenCoords.x, lineY - (numLines * lineHeight) }, { COLOUR_NULL }, bufferPtr);
bufferPtr = GetStringEnd(bufferPtr) + 1;
lineY += lineHeight;
}
src/openrct2/interface/Colour.cpp
+3 -3
View File
@@ -26,8 +26,8 @@ namespace OpenRCT2::Colour
{ "dark_blue", COLOUR_DARK_BLUE },
{ "light_blue", COLOUR_LIGHT_BLUE },
{ "icy_blue", COLOUR_ICY_BLUE },
{ "teal", COLOUR_TEAL },
{ "aquamarine", COLOUR_AQUAMARINE },
{ "teal", COLOUR_DARK_WATER },
{ "aquamarine", COLOUR_LIGHT_WATER },
{ "saturated_green", COLOUR_SATURATED_GREEN },
{ "dark_green", COLOUR_DARK_GREEN },
{ "moss_green", COLOUR_MOSS_GREEN },
@@ -67,7 +67,7 @@ namespace OpenRCT2::Colour
{ "saturated_purple_dark", COLOUR_SATURATED_PURPLE_DARK },
{ "saturated_purple_light", COLOUR_SATURATED_PURPLE_LIGHT },
{ "orange_light", COLOUR_ORANGE_LIGHT },
{ "aqua_dark", COLOUR_AQUA_DARK },
{ "aqua_dark", COLOUR_DEEP_WATER },
{ "magenta_light", COLOUR_MAGENTA_LIGHT },
{ "dull_brown_dark", COLOUR_DULL_BROWN_DARK },
{ "dull_brown_light", COLOUR_DULL_BROWN_LIGHT },
src/openrct2/interface/Colour.h
+3 -28
View File
@@ -10,7 +10,6 @@
#pragma once
#include "../core/StringTypes.h"
#include "../drawing/PaletteIndex.h"
#include <cstdint>
#include <string_view>
@@ -32,8 +31,8 @@ enum : colour_t
COLOUR_DARK_BLUE, // Dark blue
COLOUR_LIGHT_BLUE, // Light blue
COLOUR_ICY_BLUE, // Icy blue
COLOUR_TEAL, // Dark water
COLOUR_AQUAMARINE, // Light water
COLOUR_DARK_WATER, // Dark water
COLOUR_LIGHT_WATER, // Light water
COLOUR_SATURATED_GREEN, // Saturated green
COLOUR_DARK_GREEN, // Dark green
COLOUR_MOSS_GREEN, // Moss green
@@ -75,7 +74,7 @@ enum : colour_t
COLOUR_SATURATED_PURPLE_DARK, // Violet
COLOUR_SATURATED_PURPLE_LIGHT, // Lavender
COLOUR_ORANGE_LIGHT, // Pastel orange
COLOUR_AQUA_DARK, // Deep water
COLOUR_DEEP_WATER, // Deep water
COLOUR_MAGENTA_LIGHT, // Pastel pink
COLOUR_DULL_BROWN_DARK, // Umber
COLOUR_DULL_BROWN_LIGHT, // Beige
@@ -87,33 +86,9 @@ enum : colour_t
COLOUR_NULL = 255,
};
/**
* These colours change depending on the current water colours.
*/
enum
{
COLOUR_DARK_WATER = 9,
COLOUR_LIGHT_WATER = 10,
COLOUR_DEEP_WATER = 50
};
constexpr auto kPaletteOffsetDynamic = OpenRCT2::Drawing::PaletteIndex::pi10;
constexpr uint8_t kPaletteLengthDynamic = 236;
constexpr uint8_t kPaletteLengthWaterWaves = 5;
constexpr uint8_t kPaletteLengthWaterSparkles = 5;
constexpr uint8_t kPaletteLengthRemap = 12;
constexpr auto kPaletteOffsetAnimated = OpenRCT2::Drawing::PaletteIndex::waterWaves0;
constexpr uint8_t kPaletteLengthAnimated = 16;
constexpr uint8_t kColourNumOriginal = 32;
constexpr uint8_t kColourNumNormal = 54;
constexpr colour_t kTextColour254 = 254;
constexpr colour_t kTextColour255 = 255;
namespace OpenRCT2::Colour
{
colour_t FromString(std::string_view s, colour_t defaultValue = COLOUR_BLACK);
src/openrct2/object/PeepAnimationsObject.cpp
+8 -4
View File
@@ -214,10 +214,14 @@ namespace OpenRCT2
GfxDrawSprite(rt, ImageId(_imageOffsetId + 0), centre + ScreenCoordsXY{ -8, -8 });
// Draw four cardinal directions around the inline sprite
GfxDrawSprite(rt, ImageId(_imageOffsetId + 4, COLOUR_BRIGHT_RED, COLOUR_TEAL), centre + ScreenCoordsXY{ -32, -24 });
GfxDrawSprite(rt, ImageId(_imageOffsetId + 2, COLOUR_BRIGHT_RED, COLOUR_TEAL), centre + ScreenCoordsXY{ +32, +32 });
GfxDrawSprite(rt, ImageId(_imageOffsetId + 1, COLOUR_BRIGHT_RED, COLOUR_TEAL), centre + ScreenCoordsXY{ +32, -24 });
GfxDrawSprite(rt, ImageId(_imageOffsetId + 3, COLOUR_BRIGHT_RED, COLOUR_TEAL), centre + ScreenCoordsXY{ -32, +32 });
GfxDrawSprite(
rt, ImageId(_imageOffsetId + 4, COLOUR_BRIGHT_RED, COLOUR_DARK_WATER), centre + ScreenCoordsXY{ -32, -24 });
GfxDrawSprite(
rt, ImageId(_imageOffsetId + 2, COLOUR_BRIGHT_RED, COLOUR_DARK_WATER), centre + ScreenCoordsXY{ +32, +32 });
GfxDrawSprite(
rt, ImageId(_imageOffsetId + 1, COLOUR_BRIGHT_RED, COLOUR_DARK_WATER), centre + ScreenCoordsXY{ +32, -24 });
GfxDrawSprite(
rt, ImageId(_imageOffsetId + 3, COLOUR_BRIGHT_RED, COLOUR_DARK_WATER), centre + ScreenCoordsXY{ -32, +32 });
}
void PeepAnimationsObject::SetRepositoryItem(ObjectRepositoryItem* item) const
src/openrct2/object/TerrainSurfaceObject.h
+1
View File
@@ -10,6 +10,7 @@
#pragma once
#include "../core/Money.hpp"
#include "../drawing/PaletteIndex.h"
#include "../interface/Colour.h"
#include "Object.h"
src/openrct2/rct1/Tables.cpp
+2 -2
View File
@@ -33,7 +33,7 @@ namespace OpenRCT2::RCT1
COLOUR_BRIGHT_PURPLE,
COLOUR_DARK_BLUE,
COLOUR_LIGHT_BLUE,
COLOUR_TEAL,
COLOUR_DARK_WATER,
COLOUR_SATURATED_GREEN,
COLOUR_DARK_GREEN,
COLOUR_MOSS_GREEN,
@@ -55,7 +55,7 @@ namespace OpenRCT2::RCT1
COLOUR_LIGHT_PINK,
COLOUR_DARK_PINK,
COLOUR_DARK_PURPLE,
COLOUR_AQUAMARINE,
COLOUR_LIGHT_WATER,
COLOUR_BRIGHT_YELLOW,
COLOUR_ICY_BLUE
};
src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h
+1 -1
View File
@@ -51,7 +51,7 @@ constexpr RideTypeDescriptor ClassicMiniRollerCoasterRTD =
.ColourPresets = TRACK_COLOUR_PRESETS(
{ COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_SATURATED_BROWN },
{ COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_DARK_OLIVE_GREEN },
{ COLOUR_TEAL, COLOUR_YELLOW, COLOUR_TEAL },
{ COLOUR_DARK_WATER, COLOUR_YELLOW, COLOUR_DARK_WATER },
{ COLOUR_SATURATED_BROWN, COLOUR_SATURATED_BROWN, COLOUR_OLIVE_GREEN },
{ COLOUR_BLACK, COLOUR_LIGHT_BLUE, COLOUR_BLACK },
),
src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h
+1 -1
View File
@@ -52,7 +52,7 @@ constexpr RideTypeDescriptor ClassicWoodenTwisterRollerCoasterRTD =
{ COLOUR_BORDEAUX_RED, COLOUR_BLACK, COLOUR_WHITE },
{ COLOUR_BRIGHT_RED, COLOUR_BLACK, COLOUR_GREY },
{ COLOUR_YELLOW, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN },
{ COLOUR_TEAL, COLOUR_BORDEAUX_RED, COLOUR_WHITE },
{ COLOUR_DARK_WATER, COLOUR_BORDEAUX_RED, COLOUR_WHITE },
{ COLOUR_LIGHT_BLUE, COLOUR_BLACK, COLOUR_BLACK },
),
.ColourPreview = { SPR_RIDE_DESIGN_PREVIEW_WOODEN_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_WOODEN_ROLLER_COASTER_SUPPORTS },
src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h
+5 -5
View File
@@ -56,10 +56,10 @@ constexpr RideTypeDescriptor FlyingRollerCoasterRTD =
.PhotoItem = ShopItem::photo2,
.BonusValue = 100,
.ColourPresets = TRACK_COLOUR_PRESETS(
{ COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN, COLOUR_TEAL },
{ COLOUR_TEAL, COLOUR_TEAL, COLOUR_BORDEAUX_RED },
{ COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN, COLOUR_DARK_WATER },
{ COLOUR_DARK_WATER, COLOUR_DARK_WATER, COLOUR_BORDEAUX_RED },
{ COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_DARK_PURPLE },
{ COLOUR_DULL_GREEN_DARK, COLOUR_SATURATED_GREEN_LIGHT, COLOUR_AQUA_DARK },
{ COLOUR_DULL_GREEN_DARK, COLOUR_SATURATED_GREEN_LIGHT, COLOUR_DEEP_WATER },
{ COLOUR_BORDEAUX_RED_DARK, COLOUR_BORDEAUX_RED_DARK, COLOUR_SATURATED_BROWN }, // FLY
{ COLOUR_LIGHT_BLUE, COLOUR_DARK_BLUE, COLOUR_ICY_BLUE }, // Manta
{ COLOUR_YELLOW, COLOUR_BRIGHT_RED, COLOUR_LIGHT_ORANGE } // Tatsu
@@ -131,8 +131,8 @@ constexpr RideTypeDescriptor FlyingRollerCoasterAltRTD =
.PhotoItem = ShopItem::photo2,
.BonusValue = 100,
.ColourPresets = TRACK_COLOUR_PRESETS(
{ COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN, COLOUR_TEAL },
{ COLOUR_TEAL, COLOUR_TEAL, COLOUR_BORDEAUX_RED },
{ COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN, COLOUR_DARK_WATER },
{ COLOUR_DARK_WATER, COLOUR_DARK_WATER, COLOUR_BORDEAUX_RED },
{ COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_DARK_PURPLE },
),
.ColourPreview = { SPR_RIDE_DESIGN_PREVIEW_FLYING_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_FLYING_ROLLER_COASTER_SUPPORTS },
src/openrct2/ride/rtd/coaster/HyperTwister.h
+2 -2
View File
@@ -53,11 +53,11 @@ constexpr RideTypeDescriptor HyperTwisterRTD =
.BonusValue = 120,
.ColourPresets = TRACK_COLOUR_PRESETS(
{ COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_BORDEAUX_RED },
{ COLOUR_AQUAMARINE, COLOUR_AQUAMARINE, COLOUR_DARK_PURPLE },
{ COLOUR_LIGHT_WATER, COLOUR_LIGHT_WATER, COLOUR_DARK_PURPLE },
{ COLOUR_WHITE, COLOUR_WHITE, COLOUR_LIGHT_BLUE },
{ COLOUR_DARK_GREEN, COLOUR_MOSS_GREEN, COLOUR_DARK_BROWN },
{ COLOUR_BORDEAUX_RED, COLOUR_LIGHT_ORANGE, COLOUR_WHITE },
{ COLOUR_DARK_PURPLE, COLOUR_SATURATED_PURPLE_DARK, COLOUR_AQUA_DARK }, // Mako
{ COLOUR_DARK_PURPLE, COLOUR_SATURATED_PURPLE_DARK, COLOUR_DEEP_WATER }, // Mako
),
.ColourPreview = { SPR_RIDE_DESIGN_PREVIEW_TWISTER_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_TWISTER_ROLLER_COASTER_SUPPORTS },
.ColourKey = RideColourKey::Ride,
src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h
+1 -1
View File
@@ -54,7 +54,7 @@ constexpr RideTypeDescriptor InvertedImpulseCoasterRTD =
{ COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_WHITE },
{ COLOUR_BRIGHT_PURPLE, COLOUR_BRIGHT_PURPLE, COLOUR_BORDEAUX_RED },
{ COLOUR_BRIGHT_YELLOW, COLOUR_BRIGHT_YELLOW, COLOUR_BORDEAUX_RED }, // Volcano: The Blast Coaster
{ COLOUR_BRIGHT_YELLOW, COLOUR_BRIGHT_YELLOW, COLOUR_TEAL }, // Wicked Twister
{ COLOUR_BRIGHT_YELLOW, COLOUR_BRIGHT_YELLOW, COLOUR_DARK_WATER }, // Wicked Twister
),
.ColourPreview = { SPR_RIDE_DESIGN_PREVIEW_INVERTED_IMPULSE_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_INVERTED_IMPULSE_COASTER_SUPPORTS },
.ColourKey = RideColourKey::Ride,
src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h
+1 -1
View File
@@ -52,7 +52,7 @@ constexpr RideTypeDescriptor JuniorRollerCoasterRTD =
.ColourPresets = TRACK_COLOUR_PRESETS(
{ COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_SATURATED_BROWN },
{ COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED, COLOUR_DARK_OLIVE_GREEN },
{ COLOUR_TEAL, COLOUR_YELLOW, COLOUR_TEAL },
{ COLOUR_DARK_WATER, COLOUR_YELLOW, COLOUR_DARK_WATER },
{ COLOUR_SATURATED_BROWN, COLOUR_SATURATED_BROWN, COLOUR_OLIVE_GREEN },
{ COLOUR_BLACK, COLOUR_LIGHT_BLUE, COLOUR_BLACK },
),
src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h
+1 -1
View File
@@ -54,7 +54,7 @@ constexpr RideTypeDescriptor LIMLaunchedRollerCoasterRTD =
{ COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_DARK_BROWN },
{ COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_SATURATED_GREEN },
{ COLOUR_BRIGHT_GREEN, COLOUR_SATURATED_GREEN_LIGHT, COLOUR_SATURATED_PURPLE_DARK}, // Joker's Jinx
{ COLOUR_SATURATED_GREEN_LIGHT, COLOUR_GRASS_GREEN_LIGHT , COLOUR_AQUA_DARK}, // Poltergeist
{ COLOUR_SATURATED_GREEN_LIGHT, COLOUR_GRASS_GREEN_LIGHT , COLOUR_DEEP_WATER}, // Poltergeist
{ COLOUR_GREY, COLOUR_DARK_BROWN , COLOUR_BLACK}, // Flight of Fear
),
.ColourPreview = { SPR_RIDE_DESIGN_PREVIEW_LIM_LAUNCHED_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_LIM_LAUNCHED_ROLLER_COASTER_SUPPORTS },
src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h
+1 -1
View File
@@ -57,7 +57,7 @@ constexpr RideTypeDescriptor LoopingRollerCoasterRTD =
{ COLOUR_LIGHT_PURPLE, COLOUR_LIGHT_PURPLE, COLOUR_DARK_GREEN },
{ COLOUR_OLIVE_GREEN, COLOUR_OLIVE_GREEN, COLOUR_LIGHT_BROWN },
{ COLOUR_GREY, COLOUR_LIGHT_ORANGE, COLOUR_GREY },
{ COLOUR_GRASS_GREEN_LIGHT, COLOUR_SATURATED_GREEN_LIGHT, COLOUR_AQUA_DARK }, // Mindbender
{ COLOUR_GRASS_GREEN_LIGHT, COLOUR_SATURATED_GREEN_LIGHT, COLOUR_DEEP_WATER }, // Mindbender
),
.ColourPreview = { SPR_RIDE_DESIGN_PREVIEW_LOOPING_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_LOOPING_ROLLER_COASTER_SUPPORTS },
.ColourKey = RideColourKey::Ride,
src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h
+1 -1
View File
@@ -52,7 +52,7 @@ constexpr RideTypeDescriptor TwisterRollerCoasterRTD =
.BonusValue = 120,
.ColourPresets = TRACK_COLOUR_PRESETS(
{ COLOUR_YELLOW, COLOUR_YELLOW, COLOUR_BORDEAUX_RED },
{ COLOUR_AQUAMARINE, COLOUR_AQUAMARINE, COLOUR_DARK_PURPLE },
{ COLOUR_LIGHT_WATER, COLOUR_LIGHT_WATER, COLOUR_DARK_PURPLE },
{ COLOUR_WHITE, COLOUR_WHITE, COLOUR_LIGHT_BLUE },
{ COLOUR_DARK_GREEN, COLOUR_MOSS_GREEN, COLOUR_DARK_BROWN },
{ COLOUR_BORDEAUX_RED, COLOUR_LIGHT_ORANGE, COLOUR_WHITE },
src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h
+1 -1
View File
@@ -52,7 +52,7 @@ constexpr RideTypeDescriptor WoodenRollerCoasterRTD =
{ COLOUR_BORDEAUX_RED, COLOUR_BLACK, COLOUR_WHITE },
{ COLOUR_BRIGHT_RED, COLOUR_BLACK, COLOUR_GREY },
{ COLOUR_YELLOW, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN },
{ COLOUR_TEAL, COLOUR_BORDEAUX_RED, COLOUR_WHITE },
{ COLOUR_DARK_WATER, COLOUR_BORDEAUX_RED, COLOUR_WHITE },
{ COLOUR_LIGHT_BLUE, COLOUR_BLACK, COLOUR_BLACK },
{ COLOUR_LIGHT_BLUE, COLOUR_BLACK, COLOUR_DARK_BROWN },
{ COLOUR_SATURATED_BROWN_LIGHT, COLOUR_TAN_DARK, COLOUR_LIGHT_BROWN }, // Generic GCI
src/openrct2/ride/rtd/gentle/GhostTrain.h
+1 -1
View File
@@ -53,7 +53,7 @@ constexpr RideTypeDescriptor GhostTrainRTD =
.BonusValue = 50,
.ColourPresets = TRACK_COLOUR_PRESETS(
{ COLOUR_DARK_GREEN, COLOUR_BORDEAUX_RED, COLOUR_BLACK },
{ COLOUR_TEAL, COLOUR_WHITE, COLOUR_DARK_BROWN },
{ COLOUR_DARK_WATER, COLOUR_WHITE, COLOUR_DARK_BROWN },
{ COLOUR_DARK_BROWN, COLOUR_BORDEAUX_RED, COLOUR_BLACK },
{ COLOUR_BORDEAUX_RED, COLOUR_YELLOW, COLOUR_BLACK },
),
src/openrct2/ride/rtd/thrill/TopSpin.h
+1 -1
View File
@@ -49,7 +49,7 @@ constexpr RideTypeDescriptor TopSpinRTD =
.BonusValue = 55,
.ColourPresets = TRACK_COLOUR_PRESETS(
{ COLOUR_BRIGHT_RED, COLOUR_YELLOW, COLOUR_YELLOW },
{ COLOUR_TEAL, COLOUR_WHITE, COLOUR_WHITE },
{ COLOUR_DARK_WATER, COLOUR_WHITE, COLOUR_WHITE },
{ COLOUR_DARK_GREEN, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED },
),
.ColourPreview = { SPR_RIDE_DESIGN_PREVIEW_TOP_SPIN_TRACK, 0 },
src/openrct2/ride/rtd/water/DinghySlide.h
+1 -1
View File
@@ -65,7 +65,7 @@ constexpr RideTypeDescriptor DinghySlideRTD =
.BonusValue = 55,
.ColourPresets = TRACK_COLOUR_PRESETS(
{ COLOUR_DARK_GREEN, COLOUR_SATURATED_BROWN, COLOUR_DARK_GREEN },
{ COLOUR_TEAL, COLOUR_BORDEAUX_RED, COLOUR_TEAL },
{ COLOUR_DARK_WATER, COLOUR_BORDEAUX_RED, COLOUR_DARK_WATER },
{ COLOUR_BRIGHT_RED, COLOUR_GREY, COLOUR_SATURATED_RED },
),
.ColourPreview = { SPR_RIDE_DESIGN_PREVIEW_DINGHY_SLIDE_TRACK, SPR_RIDE_DESIGN_PREVIEW_DINGHY_SLIDE_SUPPORTS },
src/openrct2/world/tile_element/LargeSceneryElement.cpp
+1
View File
@@ -9,6 +9,7 @@
#include "LargeSceneryElement.h"
#include "../../interface/Colour.h"
#include "../../object/LargeSceneryEntry.h"
#include "../../object/ObjectEntryManager.h"
#include "../../object/ObjectManager.h"