diff --git a/src/openrct2-ui/windows/Dropdown.cpp b/src/openrct2-ui/windows/Dropdown.cpp index 5d5aaa0e20..2c6fcd0af0 100644 --- a/src/openrct2-ui/windows/Dropdown.cpp +++ b/src/openrct2-ui/windows/Dropdown.cpp @@ -499,7 +499,7 @@ static constexpr colour_t kColoursDropdownOrder[] = { int32_t defaultIndex = -1; const bool specialColoursEnabled = !alwaysHideSpecialColours && GetGameState().Cheats.AllowSpecialColourSchemes; - auto numColours = specialColoursEnabled ? static_cast(COLOUR_COUNT) : COLOUR_NUM_NORMAL; + auto numColours = specialColoursEnabled ? static_cast(COLOUR_COUNT) : kColourNumNormal; // Set items for (uint64_t i = 0; i < numColours; i++) { diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index dd9fb3a759..242c43d533 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -4294,19 +4294,19 @@ namespace OpenRCT2::Ui::Windows for (auto i = 0; i < numItems; i++) { - colour_t colour = UtilRand() % COLOUR_NUM_NORMAL; + colour_t colour = UtilRand() % kColourNumNormal; auto vehicleSetBodyColourAction = RideSetAppearanceAction( rideId, RideSetAppearanceType::VehicleColourBody, colour, i); GameActions::Execute(&vehicleSetBodyColourAction); if (allowChangingTrimColour) { - colour = UtilRand() % COLOUR_NUM_NORMAL; + colour = UtilRand() % kColourNumNormal; auto vehicleSetTrimColourAction = RideSetAppearanceAction( rideId, RideSetAppearanceType::VehicleColourTrim, colour, i); GameActions::Execute(&vehicleSetTrimColourAction); if (allowChangingTertiaryColour) { - colour = UtilRand() % COLOUR_NUM_NORMAL; + colour = UtilRand() % kColourNumNormal; auto vehicleSetTertiaryColourAction = RideSetAppearanceAction( rideId, RideSetAppearanceType::VehicleColourTertiary, colour, i); GameActions::Execute(&vehicleSetTertiaryColourAction); @@ -4907,7 +4907,7 @@ namespace OpenRCT2::Ui::Windows if ((GetGameState().CurrentTicks % 64) == 0) { spriteColour++; - if (spriteColour >= COLOUR_NUM_NORMAL) + if (spriteColour >= kColourNumNormal) { spriteColour = COLOUR_BLACK; } diff --git a/src/openrct2/actions/CheatSetAction.cpp b/src/openrct2/actions/CheatSetAction.cpp index a5eb906970..cc81dd174e 100644 --- a/src/openrct2/actions/CheatSetAction.cpp +++ b/src/openrct2/actions/CheatSetAction.cpp @@ -687,12 +687,12 @@ void CheatSetAction::GiveObjectToGuests(int32_t object) const break; case OBJECT_BALLOON: peep->GiveItem(ShopItem::Balloon); - peep->BalloonColour = ScenarioRandMax(COLOUR_NUM_NORMAL); + peep->BalloonColour = ScenarioRandMax(kColourNumNormal); peep->UpdateAnimationGroup(); break; case OBJECT_UMBRELLA: peep->GiveItem(ShopItem::Umbrella); - peep->UmbrellaColour = ScenarioRandMax(COLOUR_NUM_NORMAL); + peep->UmbrellaColour = ScenarioRandMax(kColourNumOriginal); peep->UpdateAnimationGroup(); break; } diff --git a/src/openrct2/drawing/Drawing.Sprite.cpp b/src/openrct2/drawing/Drawing.Sprite.cpp index e0837e580c..95821849c8 100644 --- a/src/openrct2/drawing/Drawing.Sprite.cpp +++ b/src/openrct2/drawing/Drawing.Sprite.cpp @@ -468,22 +468,21 @@ static std::optional FASTCALL GfxDrawSpriteGetPalette(ImageId imageI if (tertiaryPaletteMap.has_value()) { paletteMap.Copy( - PALETTE_OFFSET_REMAP_TERTIARY, tertiaryPaletteMap.value(), PALETTE_OFFSET_REMAP_PRIMARY, PALETTE_LENGTH_REMAP); + kPaletteOffsetRemapTertiary, tertiaryPaletteMap.value(), kPaletteOffsetRemapPrimary, kPaletteLengthRemap); } } auto primaryPaletteMap = GetPaletteMapForColour(imageId.GetPrimary()); if (primaryPaletteMap.has_value()) { - paletteMap.Copy( - PALETTE_OFFSET_REMAP_PRIMARY, primaryPaletteMap.value(), PALETTE_OFFSET_REMAP_PRIMARY, PALETTE_LENGTH_REMAP); + paletteMap.Copy(kPaletteOffsetRemapPrimary, primaryPaletteMap.value(), kPaletteOffsetRemapPrimary, kPaletteLengthRemap); } auto secondaryPaletteMap = GetPaletteMapForColour(imageId.GetSecondary()); if (secondaryPaletteMap.has_value()) { paletteMap.Copy( - PALETTE_OFFSET_REMAP_SECONDARY, secondaryPaletteMap.value(), PALETTE_OFFSET_REMAP_PRIMARY, PALETTE_LENGTH_REMAP); + kPaletteOffsetRemapSecondary, secondaryPaletteMap.value(), kPaletteOffsetRemapPrimary, kPaletteLengthRemap); } return paletteMap; diff --git a/src/openrct2/drawing/Drawing.cpp b/src/openrct2/drawing/Drawing.cpp index 1e35a1129f..9ef52ab936 100644 --- a/src/openrct2/drawing/Drawing.cpp +++ b/src/openrct2/drawing/Drawing.cpp @@ -996,7 +996,7 @@ void UpdatePaletteEffects() paletteOffset[(i * 4) + 1] = -((0xFF - g1->offset[(i * 3) + 1]) / 2) - 1; paletteOffset[(i * 4) + 2] = -((0xFF - g1->offset[(i * 3) + 2]) / 2) - 1; } - UpdatePalette(gGamePalette, PALETTE_OFFSET_DYNAMIC, PALETTE_LENGTH_DYNAMIC); + UpdatePalette(gGamePalette, kPaletteOffsetDynamic, kPaletteLengthDynamic); } gClimateLightningFlash++; } @@ -1052,8 +1052,8 @@ void UpdatePaletteEffects() if (g1 != nullptr) { uint8_t* vs = &g1->offset[j * 3]; - uint8_t* vd = &gGamePalette[PALETTE_OFFSET_WATER_WAVES * 4]; - int32_t n = PALETTE_LENGTH_WATER_WAVES; + uint8_t* vd = &gGamePalette[kPaletteOffsetWaterWaves * 4]; + int32_t n = kPaletteLengthWaterWaves; for (int32_t i = 0; i < n; i++) { vd[0] = vs[0]; @@ -1077,8 +1077,8 @@ void UpdatePaletteEffects() if (g1 != nullptr) { uint8_t* vs = &g1->offset[j * 3]; - uint8_t* vd = &gGamePalette[PALETTE_OFFSET_WATER_SPARKLES * 4]; - int32_t n = PALETTE_LENGTH_WATER_SPARKLES; + uint8_t* vd = &gGamePalette[kPaletteOffsetWaterSparkles * 4]; + int32_t n = kPaletteLengthWaterSparkles; for (int32_t i = 0; i < n; i++) { vd[0] = vs[0]; @@ -1115,10 +1115,10 @@ void UpdatePaletteEffects() } } - UpdatePalette(gGamePalette, PALETTE_OFFSET_ANIMATED, PALETTE_LENGTH_ANIMATED); + UpdatePalette(gGamePalette, kPaletteOffsetAnimated, kPaletteLengthAnimated); if (gClimateLightningFlash == 2) { - UpdatePalette(gGamePalette, PALETTE_OFFSET_DYNAMIC, PALETTE_LENGTH_DYNAMIC); + UpdatePalette(gGamePalette, kPaletteOffsetDynamic, kPaletteLengthDynamic); gClimateLightningFlash = 0; } } diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index 6cac0b9c92..36a3f94d14 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -1639,16 +1639,16 @@ bool Guest::DecideAndBuyItem(Ride& ride, const ShopItem shopItem, money64 price) const auto hasRandomShopColour = ride.HasLifecycleFlag(RIDE_LIFECYCLE_RANDOM_SHOP_COLOURS); if (shopItem == ShopItem::TShirt) - TshirtColour = hasRandomShopColour ? ScenarioRandMax(COLOUR_NUM_NORMAL) : ride.track_colour[0].main; + TshirtColour = hasRandomShopColour ? ScenarioRandMax(kColourNumNormal) : ride.track_colour[0].main; if (shopItem == ShopItem::Hat) - HatColour = hasRandomShopColour ? ScenarioRandMax(COLOUR_NUM_NORMAL) : ride.track_colour[0].main; + HatColour = hasRandomShopColour ? ScenarioRandMax(kColourNumNormal) : ride.track_colour[0].main; if (shopItem == ShopItem::Balloon) - BalloonColour = hasRandomShopColour ? ScenarioRandMax(COLOUR_NUM_NORMAL) : ride.track_colour[0].main; + BalloonColour = hasRandomShopColour ? ScenarioRandMax(kColourNumNormal) : ride.track_colour[0].main; if (shopItem == ShopItem::Umbrella) - UmbrellaColour = hasRandomShopColour ? ScenarioRandMax(COLOUR_NUM_NORMAL) : ride.track_colour[0].main; + UmbrellaColour = hasRandomShopColour ? ScenarioRandMax(kColourNumNormal) : ride.track_colour[0].main; if (shopItem == ShopItem::Map) ResetPathfindGoal(); diff --git a/src/openrct2/interface/Colour.cpp b/src/openrct2/interface/Colour.cpp index b4bd48c3a4..2060010cba 100644 --- a/src/openrct2/interface/Colour.cpp +++ b/src/openrct2/interface/Colour.cpp @@ -44,7 +44,7 @@ void ColoursInitMaps() for (int32_t i = 0; i < COLOUR_COUNT; i++) { // Get palette index in g1 / g2 - const auto paletteIndex = (i < COLOUR_NUM_ORIGINAL) ? SPR_PALETTE_2_START : SPR_G2_PALETTE_BEGIN - COLOUR_NUM_ORIGINAL; + const auto paletteIndex = (i < kColourNumOriginal) ? SPR_PALETTE_2_START : SPR_G2_PALETTE_BEGIN - kColourNumOriginal; const G1Element* g1 = GfxGetG1Element(paletteIndex + i); if (g1 != nullptr) { diff --git a/src/openrct2/interface/Colour.h b/src/openrct2/interface/Colour.h index 0e8e8dfa08..edf055eef3 100644 --- a/src/openrct2/interface/Colour.h +++ b/src/openrct2/interface/Colour.h @@ -187,29 +187,29 @@ enum : PaletteIndex PALETTE_INDEX_254 = 254, // Primary remap 11 }; -constexpr size_t PALETTE_COUNT = 256; +constexpr size_t kPaletteCount = 256; -constexpr uint8_t PALETTE_OFFSET_DYNAMIC = PALETTE_INDEX_10; -constexpr uint8_t PALETTE_LENGTH_DYNAMIC = 236; +constexpr uint8_t kPaletteOffsetDynamic = PALETTE_INDEX_10; +constexpr uint8_t kPaletteLengthDynamic = 236; -constexpr uint8_t PALETTE_OFFSET_WATER_WAVES = PALETTE_INDEX_230; -constexpr uint8_t PALETTE_OFFSET_WATER_SPARKLES = PALETTE_INDEX_235; -constexpr uint8_t PALETTE_LENGTH_WATER_WAVES = 5; -constexpr uint8_t PALETTE_LENGTH_WATER_SPARKLES = 5; +constexpr uint8_t kPaletteOffsetWaterWaves = PALETTE_INDEX_230; +constexpr uint8_t kPaletteOffsetWaterSparkles = PALETTE_INDEX_235; +constexpr uint8_t kPaletteLengthWaterWaves = 5; +constexpr uint8_t kPaletteLengthWaterSparkles = 5; -constexpr uint8_t PALETTE_OFFSET_TRACK_RAILS = PALETTE_INDEX_240; -constexpr uint8_t PALETTE_LENGTH_TRACK_RAILS = 3; +constexpr uint8_t kPaletteOffsetTrackRails = PALETTE_INDEX_240; +constexpr uint8_t kPaletteLengthTrackRails = 3; -constexpr uint8_t PALETTE_OFFSET_REMAP_PRIMARY = PALETTE_INDEX_243; -constexpr uint8_t PALETTE_OFFSET_REMAP_SECONDARY = PALETTE_INDEX_202; -constexpr uint8_t PALETTE_OFFSET_REMAP_TERTIARY = PALETTE_INDEX_46; -constexpr uint8_t PALETTE_LENGTH_REMAP = 12; +constexpr uint8_t kPaletteOffsetRemapPrimary = PALETTE_INDEX_243; +constexpr uint8_t kPaletteOffsetRemapSecondary = PALETTE_INDEX_202; +constexpr uint8_t kPaletteOffsetRemapTertiary = PALETTE_INDEX_46; +constexpr uint8_t kPaletteLengthRemap = 12; -constexpr uint8_t PALETTE_OFFSET_ANIMATED = PALETTE_INDEX_230; -constexpr uint8_t PALETTE_LENGTH_ANIMATED = 16; +constexpr uint8_t kPaletteOffsetAnimated = PALETTE_INDEX_230; +constexpr uint8_t kPaletteLengthAnimated = 16; -constexpr uint8_t COLOUR_NUM_ORIGINAL = 32; -constexpr uint8_t COLOUR_NUM_NORMAL = 54; +constexpr uint8_t kColourNumOriginal = 32; +constexpr uint8_t kColourNumNormal = 54; static constexpr uint8_t kLegacyColourFlagTranslucent = (1 << 7); @@ -269,5 +269,5 @@ namespace OpenRCT2::Colour uint8_t BlendColours(const uint8_t paletteIndex1, const uint8_t paletteIndex2); #endif -typedef uint8_t BlendColourMapType[PALETTE_COUNT][PALETTE_COUNT]; +typedef uint8_t BlendColourMapType[kPaletteCount][kPaletteCount]; BlendColourMapType* GetBlendColourMap();