mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 13:33:02 +01:00
Code Issues Releases Wiki Activity

More cleanup

Browse Source
This commit is contained in:
Trevor Finney
2023-02-21 07:28:03 -05:00
parent c49651b487
commit abac9cc4a9
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/interface/Widget.cpp
View File

@@ -1188,7 +1188,7 @@ ImageId GetColourButtonImage(colour_t colour)
{
if (colour == COLOUR_OFFSET_INVISIBLE)
{
return ImageId(SPR_G2_ICON_PALETTE_INVISIBLE - 1, colour).WithBlended(false);
return ImageId(SPR_G2_ICON_PALETTE_INVISIBLE, colour).WithBlended(false);
}
else
{

2
src/openrct2/actions/CheatSetAction.cpp
View File

@@ -245,7 +245,7 @@ GameActions::Result CheatSetAction::Execute() const
gCheatsAllowRegularPathAsQueue = _param1 != 0;
break;
case CheatType::AllowSpecialColorSchemes:
gCheatsAllowSpecialColorSchemes = _param1 != 0;
gCheatsAllowSpecialColorSchemes = static_cast<bool>(_param1);
break;
default:
{

4
src/openrct2/drawing/Drawing.cpp
View File

@@ -295,7 +295,7 @@ enum
SPR_PALETTE_GLASS_LIGHT_PINK = 5047,
// Start of G2 Palettes
SPR_PALETTE_DARK_OLIVE_DARK = SPR_G2_PALETTE_BEGIN - 1,
SPR_PALETTE_DARK_OLIVE_DARK = SPR_G2_PALETTE_BEGIN,
SPR_PALETTE_DARK_OLIVE_LIGHT,
SPR_PALETTE_SATURATED_BROWN_LIGHT,
SPR_PALETTE_BORDEAUX_RED_DARK,
@@ -406,7 +406,7 @@ const FilterPaletteID GlassPaletteIds[COLOUR_COUNT] = {
};
// Previously 0x97FCBC use it to get the correct palette from g1_elements
static const uint16_t palette_to_g1_offset[PALETTE_TOTAL_OFFSETS] = {
static constexpr uint16_t palette_to_g1_offset[PALETTE_TOTAL_OFFSETS] = {
SPR_PALETTE_BLACK,
SPR_PALETTE_GREY,
SPR_PALETTE_WHITE,

2
src/openrct2/interface/Colour.cpp
View File

@@ -40,7 +40,7 @@ void ColoursInitMaps()
for (int32_t i = 0; i < COLOUR_COUNT; i++)
{
// Get palette index in g1 / g2
auto paletteIndex = (i < COLOUR_NUM_ORIGINAL) ? SPR_PALETTE_2_START : SPR_G2_PALETTE_BEGIN - COLOUR_NUM_ORIGINAL;
const auto paletteIndex = (i < COLOUR_NUM_ORIGINAL) ? SPR_PALETTE_2_START : SPR_G2_PALETTE_BEGIN - COLOUR_NUM_ORIGINAL;
const G1Element* g1 = GfxGetG1Element(paletteIndex + i);
//TODO: Integrate themes with G2 palettes
if (g1 != nullptr)

5
src/openrct2/sprites.h
View File

@@ -1364,8 +1364,9 @@ enum
SPR_G2_ALPINE_LIFT_TRACK_GENTLE_DIAGONAL = SPR_G2_ALPINE_LIFT_TRACK_FLAT_DIAGONAL + 4,
SPR_G2_ALPINE_END = SPR_G2_ALPINE_LIFT_TRACK_GENTLE_DIAGONAL + 12,
SPR_G2_ICON_PALETTE_INVISIBLE,
SPR_G2_ICON_PALETTE_INVISIBLE = SPR_G2_ALPINE_END,
SPR_G2_ICON_PALETTE_INVISIBLE_PRESSED,
SPR_G2_PALETTE_BEGIN,
SPR_G2_PAL_REMAP_DARK_OLIVE_DARK = SPR_G2_PALETTE_BEGIN,
SPR_G2_PAL_REMAP_DARK_OLIVE_LIGHT,
@@ -1417,7 +1418,7 @@ enum
SPR_G2_PAL_GLASS_VOID,
SPR_G2_PALETTE_END = SPR_G2_PAL_GLASS_VOID,
SPR_G2_END = SPR_G2_PALETTE_END,
SPR_G2_END,
SPR_CSG_BEGIN = SPR_G2_END,
SPR_CSG_END = SPR_CSG_BEGIN + RCT1::Limits::Num_LL_CSG_Entries,