diff --git a/src/openrct2-ui/scripting/ScGraphicsContext.hpp b/src/openrct2-ui/scripting/ScGraphicsContext.hpp index 08c0edf1cd..d41e3d227d 100644 --- a/src/openrct2-ui/scripting/ScGraphicsContext.hpp +++ b/src/openrct2-ui/scripting/ScGraphicsContext.hpp @@ -24,7 +24,7 @@ namespace OpenRCT2::Scripting std::optional _colour{}; std::optional _secondaryColour{}; - std::optional _ternaryColour{}; + std::optional _tertiaryColour{}; std::optional _paletteId{}; uint8_t _stroke{}; uint8_t _fill{}; @@ -91,15 +91,15 @@ namespace OpenRCT2::Scripting DukValue ternaryColour_get() const { - return ToDuk(_ctx, _ternaryColour); + return ToDuk(_ctx, _tertiaryColour); } void ternaryColour_set(DukValue value) { if (value.type() == DukValue::NUMBER) - _ternaryColour = static_cast(value.as_int()); + _tertiaryColour = static_cast(value.as_int()); else - _ternaryColour = {}; + _tertiaryColour = {}; } DukValue paletteId_get() const @@ -226,7 +226,7 @@ namespace OpenRCT2::Scripting } } - gfx_draw_sprite(&_dpi, img.WithTertiary(_ternaryColour.value_or(0)), { x, y }); + gfx_draw_sprite(&_dpi, img.WithTertiary(_tertiaryColour.value_or(0)), { x, y }); } void line(int32_t x1, int32_t y1, int32_t x2, int32_t y2) diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index c63a8bf4d2..5496186483 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -948,7 +948,7 @@ static void WindowRideDrawTabVehicle(rct_drawpixelinfo* dpi, rct_window* w) imageIndex &= rideVehicleEntry->rotation_frame_mask; imageIndex *= rideVehicleEntry->base_num_frames; imageIndex += rideVehicleEntry->base_image_id; - auto imageId = ImageId(imageIndex, vehicleColour.Body, vehicleColour.Trim, vehicleColour.Ternary); + auto imageId = ImageId(imageIndex, vehicleColour.Body, vehicleColour.Trim, vehicleColour.Tertiary); gfx_draw_sprite(&clipDPI, imageId, screenCoords); } } @@ -2966,7 +2966,7 @@ static void WindowRideVehicleScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, imageIndex *= rideVehicleEntry->base_num_frames; imageIndex += rideVehicleEntry->base_image_id; - auto imageId = ImageId(imageIndex, vehicleColour.Body, vehicleColour.Trim, vehicleColour.Ternary); + auto imageId = ImageId(imageIndex, vehicleColour.Body, vehicleColour.Trim, vehicleColour.Tertiary); nextSpriteToDraw->x = x; nextSpriteToDraw->y = y; @@ -4320,7 +4320,7 @@ static void WindowRideColourMousedown(rct_window* w, rct_widgetindex widgetIndex break; case WIDX_VEHICLE_TERNARY_COLOUR: vehicleColour = ride_get_vehicle_colour(ride, w->vehicleIndex); - WindowDropdownShowColour(w, widget, w->colours[1], vehicleColour.Ternary); + WindowDropdownShowColour(w, widget, w->colours[1], vehicleColour.Tertiary); break; } } @@ -4628,7 +4628,7 @@ static void WindowRideColourInvalidate(rct_window* w) { window_ride_colour_widgets[WIDX_VEHICLE_TERNARY_COLOUR].type = WindowWidgetType::ColourBtn; window_ride_colour_widgets[WIDX_VEHICLE_TERNARY_COLOUR].image = WindowRideGetColourButtonImage( - vehicleColour.Ternary); + vehicleColour.Tertiary); } else { @@ -4835,7 +4835,7 @@ static void WindowRideColourScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, i imageIndex &= rideVehicleEntry->rotation_frame_mask; imageIndex *= rideVehicleEntry->base_num_frames; imageIndex += rideVehicleEntry->base_image_id; - auto imageId = ImageId(imageIndex, vehicleColour.Body, vehicleColour.Trim, vehicleColour.Ternary); + auto imageId = ImageId(imageIndex, vehicleColour.Body, vehicleColour.Trim, vehicleColour.Tertiary); gfx_draw_sprite(dpi, imageId, screenCoords); } diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 71d2442e8e..6710ade397 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -585,7 +585,7 @@ public: if (wallEntry->flags2 & WALL_SCENERY_2_NO_SELECT_PRIMARY_COLOUR) widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WindowWidgetType::Empty; - if (wallEntry->flags & WALL_SCENERY_HAS_TERNARY_COLOUR) + if (wallEntry->flags & WALL_SCENERY_HAS_TERTIARY_COLOUR) widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].type = WindowWidgetType::ColourBtn; } } @@ -1227,7 +1227,7 @@ private: if (wallEntry->flags & WALL_SCENERY_HAS_SECONDARY_COLOUR) { imageId = imageId.WithSecondary(gWindowScenerySecondaryColour); - if (wallEntry->flags & WALL_SCENERY_HAS_TERNARY_COLOUR) + if (wallEntry->flags & WALL_SCENERY_HAS_TERTIARY_COLOUR) { imageId = imageId.WithTertiary(gWindowSceneryTertiaryColour); } diff --git a/src/openrct2/actions/RideSetAppearanceAction.cpp b/src/openrct2/actions/RideSetAppearanceAction.cpp index 511484691f..554c4ad774 100644 --- a/src/openrct2/actions/RideSetAppearanceAction.cpp +++ b/src/openrct2/actions/RideSetAppearanceAction.cpp @@ -120,7 +120,7 @@ GameActions::Result RideSetAppearanceAction::Execute() const ride_update_vehicle_colours(ride); break; case RideSetAppearanceType::VehicleColourTernary: - ride->vehicle_colours[_index].Ternary = _value; + ride->vehicle_colours[_index].Tertiary = _value; ride_update_vehicle_colours(ride); break; case RideSetAppearanceType::VehicleColourScheme: diff --git a/src/openrct2/actions/TrackDesignAction.cpp b/src/openrct2/actions/TrackDesignAction.cpp index e2cdd1dfb0..c8e96d60e8 100644 --- a/src/openrct2/actions/TrackDesignAction.cpp +++ b/src/openrct2/actions/TrackDesignAction.cpp @@ -262,7 +262,7 @@ GameActions::Result TrackDesignAction::Execute() const auto tdIndex = i % std::size(_td.vehicle_colours); ride->vehicle_colours[i].Body = _td.vehicle_colours[tdIndex].body_colour; ride->vehicle_colours[i].Trim = _td.vehicle_colours[tdIndex].trim_colour; - ride->vehicle_colours[i].Ternary = _td.vehicle_additional_colour[tdIndex]; + ride->vehicle_colours[i].Tertiary = _td.vehicle_additional_colour[tdIndex]; } for (int32_t count = 1; count == 1 || r.Error != GameActions::Status::Ok; ++count) diff --git a/src/openrct2/actions/WallPlaceAction.cpp b/src/openrct2/actions/WallPlaceAction.cpp index 6eb2c4e39f..2c389a2481 100644 --- a/src/openrct2/actions/WallPlaceAction.cpp +++ b/src/openrct2/actions/WallPlaceAction.cpp @@ -374,7 +374,7 @@ GameActions::Result WallPlaceAction::Execute() const wallElement->SetEntryIndex(_wallType); wallElement->SetBannerIndex(banner != nullptr ? banner->id : BannerIndex::GetNull()); - if (wallEntry->flags & WALL_SCENERY_HAS_TERNARY_COLOUR) + if (wallEntry->flags & WALL_SCENERY_HAS_TERTIARY_COLOUR) { wallElement->SetTertiaryColour(_tertiaryColour); } diff --git a/src/openrct2/actions/WallSetColourAction.cpp b/src/openrct2/actions/WallSetColourAction.cpp index 78462b3e3b..3661dd4702 100644 --- a/src/openrct2/actions/WallSetColourAction.cpp +++ b/src/openrct2/actions/WallSetColourAction.cpp @@ -93,7 +93,7 @@ GameActions::Result WallSetColourAction::Query() const return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } - if (wallEntry->flags & WALL_SCENERY_HAS_TERNARY_COLOUR) + if (wallEntry->flags & WALL_SCENERY_HAS_TERTIARY_COLOUR) { if (_tertiaryColour > 31) { @@ -136,7 +136,7 @@ GameActions::Result WallSetColourAction::Execute() const wallElement->SetPrimaryColour(_primaryColour); wallElement->SetSecondaryColour(_secondaryColour); - if (wallEntry->flags & WALL_SCENERY_HAS_TERNARY_COLOUR) + if (wallEntry->flags & WALL_SCENERY_HAS_TERTIARY_COLOUR) { wallElement->SetTertiaryColour(_tertiaryColour); } diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index 92f0126631..54c56292a7 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -947,14 +947,14 @@ std::vector RideObject::ReadJsonColourConfiguration(json_t& jColo { carColour.Body = Colour::FromString(Json::GetString(colours[0])); carColour.Trim = carColour.Body; - carColour.Ternary = carColour.Body; + carColour.Tertiary = carColour.Body; if (colours.size() >= 2) { carColour.Trim = Colour::FromString(Json::GetString(colours[1])); } if (colours.size() >= 3) { - carColour.Ternary = Colour::FromString(Json::GetString(colours[2])); + carColour.Tertiary = Colour::FromString(Json::GetString(colours[2])); } } config.push_back(carColour); diff --git a/src/openrct2/object/WallObject.cpp b/src/openrct2/object/WallObject.cpp index 5b8499e0e5..9992653c57 100644 --- a/src/openrct2/object/WallObject.cpp +++ b/src/openrct2/object/WallObject.cpp @@ -117,7 +117,8 @@ void WallObject::ReadJson(IReadObjectContext* context, json_t& root) { "hasPrimaryColour", WALL_SCENERY_HAS_PRIMARY_COLOUR, Json::FlagType::Normal }, { "isAllowedOnSlope", WALL_SCENERY_CANT_BUILD_ON_SLOPE, Json::FlagType::Inverted }, { "hasSecondaryColour", WALL_SCENERY_HAS_SECONDARY_COLOUR, Json::FlagType::Normal }, - { "hasTernaryColour", WALL_SCENERY_HAS_TERNARY_COLOUR, Json::FlagType::Normal }, + { "hasTertiaryColour", WALL_SCENERY_HAS_TERTIARY_COLOUR, Json::FlagType::Normal }, + { "hasTernaryColour", WALL_SCENERY_HAS_TERTIARY_COLOUR, Json::FlagType::Normal }, { "hasGlass", WALL_SCENERY_HAS_GLASS, Json::FlagType::Normal }, { "isBanner", WALL_SCENERY_IS_DOUBLE_SIDED, Json::FlagType::Normal }, { "isDoubleSided", WALL_SCENERY_IS_DOUBLE_SIDED, Json::FlagType::Normal }, @@ -137,7 +138,7 @@ void WallObject::ReadJson(IReadObjectContext* context, json_t& root) // JSON and handle this on load. We should change code base in future to reflect the JSON. if (!(_legacyType.flags & WALL_SCENERY_HAS_PRIMARY_COLOUR)) { - if (_legacyType.flags & (WALL_SCENERY_HAS_SECONDARY_COLOUR | WALL_SCENERY_HAS_TERNARY_COLOUR)) + if (_legacyType.flags & (WALL_SCENERY_HAS_SECONDARY_COLOUR | WALL_SCENERY_HAS_TERTIARY_COLOUR)) { _legacyType.flags |= WALL_SCENERY_HAS_PRIMARY_COLOUR; _legacyType.flags2 |= WALL_SCENERY_2_NO_SELECT_PRIMARY_COLOUR; diff --git a/src/openrct2/paint/tile_element/Paint.Wall.cpp b/src/openrct2/paint/tile_element/Paint.Wall.cpp index a67c5cc341..6abb7ccbb6 100644 --- a/src/openrct2/paint/tile_element/Paint.Wall.cpp +++ b/src/openrct2/paint/tile_element/Paint.Wall.cpp @@ -343,7 +343,7 @@ void PaintWall(paint_session& session, uint8_t direction, int32_t height, const { imageTemplate = imageTemplate.WithSecondary(wallElement.GetSecondaryColour()); } - if (wallEntry->flags & WALL_SCENERY_HAS_TERNARY_COLOUR) + if (wallEntry->flags & WALL_SCENERY_HAS_TERTIARY_COLOUR) { imageTemplate = imageTemplate.WithTertiary(wallElement.GetTertiaryColour()); } diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index 9d41ae66d1..89aa1526ba 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -1159,7 +1159,7 @@ namespace OpenRCT2 cs.ReadWriteArray(ride.vehicle_colours, [&cs](VehicleColour& vc) { cs.ReadWrite(vc.Body); cs.ReadWrite(vc.Trim); - cs.ReadWrite(vc.Ternary); + cs.ReadWrite(vc.Tertiary); return true; }); diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 4bd196d03f..ecaa95101f 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -1142,15 +1142,15 @@ namespace RCT1 if (colourSchemeCopyDescriptor.colour3 == COPY_COLOUR_1) { - dst->vehicle_colours[i].Ternary = RCT1::GetColour(src->vehicle_colours[i].body); + dst->vehicle_colours[i].Tertiary = RCT1::GetColour(src->vehicle_colours[i].body); } else if (colourSchemeCopyDescriptor.colour3 == COPY_COLOUR_2) { - dst->vehicle_colours[i].Ternary = RCT1::GetColour(src->vehicle_colours[i].trim); + dst->vehicle_colours[i].Tertiary = RCT1::GetColour(src->vehicle_colours[i].trim); } else { - dst->vehicle_colours[i].Ternary = colourSchemeCopyDescriptor.colour3; + dst->vehicle_colours[i].Tertiary = colourSchemeCopyDescriptor.colour3; } } } diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 2d1261b32b..b2a6ad78a1 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -922,7 +922,7 @@ namespace RCT2 for (uint8_t i = 0; i < Limits::MaxTrainsPerRide; i++) { - dst->vehicle_colours[i].Ternary = src->vehicle_colours_extended[i]; + dst->vehicle_colours[i].Tertiary = src->vehicle_colours_extended[i]; } dst->total_air_time = src->total_air_time; diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 4fc14b149e..2e2e4efd73 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -4291,7 +4291,7 @@ void Ride::SetColourPreset(uint8_t index) if (rideEntry != nullptr && rideEntry->vehicle_preset_list->count > 0) { auto list = rideEntry->vehicle_preset_list->list[0]; - colours = { list.Body, list.Trim, list.Ternary }; + colours = { list.Body, list.Trim, list.Tertiary }; } } else if (index < colourPresets->count) @@ -4788,21 +4788,22 @@ void ride_update_vehicle_colours(Ride* ride) { case RIDE_COLOUR_SCHEME_ALL_SAME: colours = ride->vehicle_colours[0]; - colours.Ternary = ride->vehicle_colours[0].Ternary; + colours.Tertiary = ride->vehicle_colours[0].Tertiary; break; case RIDE_COLOUR_SCHEME_DIFFERENT_PER_TRAIN: colours = ride->vehicle_colours[i]; - colours.Ternary = ride->vehicle_colours[i].Ternary; + colours.Tertiary = ride->vehicle_colours[i].Tertiary; break; case RIDE_COLOUR_SCHEME_DIFFERENT_PER_CAR: colours = ride->vehicle_colours[std::min(carIndex, OpenRCT2::Limits::MaxCarsPerTrain - 1)]; - colours.Ternary = ride->vehicle_colours[std::min(carIndex, OpenRCT2::Limits::MaxCarsPerTrain - 1)].Ternary; + colours.Tertiary = ride->vehicle_colours[std::min(carIndex, OpenRCT2::Limits::MaxCarsPerTrain - 1)] + .Tertiary; break; } vehicle->colours.body_colour = colours.Body; vehicle->colours.trim_colour = colours.Trim; - vehicle->colours_extended = colours.Ternary; + vehicle->colours_extended = colours.Tertiary; vehicle->Invalidate(); carIndex++; } diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index b682c31eac..ff0bebeb0f 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -102,7 +102,7 @@ rct_string_id TrackDesign::CreateTrackDesign(TrackDesignState& tds, const Ride& { vehicle_colours[i].body_colour = ride.vehicle_colours[i].Body; vehicle_colours[i].trim_colour = ride.vehicle_colours[i].Trim; - vehicle_additional_colour[i] = ride.vehicle_colours[i].Ternary; + vehicle_additional_colour[i] = ride.vehicle_colours[i].Tertiary; } for (int32_t i = 0; i < RCT12::Limits::NumColourSchemes; i++) @@ -1989,7 +1989,7 @@ static bool TrackDesignPlacePreview(TrackDesignState& tds, TrackDesign* td6, mon { ride->vehicle_colours[i].Body = td6->vehicle_colours[i].body_colour; ride->vehicle_colours[i].Trim = td6->vehicle_colours[i].trim_colour; - ride->vehicle_colours[i].Ternary = td6->vehicle_additional_colour[i]; + ride->vehicle_colours[i].Tertiary = td6->vehicle_additional_colour[i]; } } diff --git a/src/openrct2/ride/VehicleColour.h b/src/openrct2/ride/VehicleColour.h index c1fdc67df5..9a537e34cb 100644 --- a/src/openrct2/ride/VehicleColour.h +++ b/src/openrct2/ride/VehicleColour.h @@ -21,5 +21,5 @@ struct VehicleColour { uint8_t Body; uint8_t Trim; - uint8_t Ternary; + uint8_t Tertiary; }; diff --git a/src/openrct2/scripting/bindings/entity/ScVehicle.cpp b/src/openrct2/scripting/bindings/entity/ScVehicle.cpp index 70152d29e3..6e6ef17473 100644 --- a/src/openrct2/scripting/bindings/entity/ScVehicle.cpp +++ b/src/openrct2/scripting/bindings/entity/ScVehicle.cpp @@ -340,7 +340,7 @@ namespace OpenRCT2::Scripting VehicleColour colours; colours.Body = vehicle->colours.body_colour; colours.Trim = vehicle->colours.trim_colour; - colours.Ternary = vehicle->colours_extended; + colours.Tertiary = vehicle->colours_extended; return ToDuk(ctx, colours); } return ToDuk(ctx, nullptr); @@ -354,7 +354,7 @@ namespace OpenRCT2::Scripting auto colours = FromDuk(value); vehicle->colours.body_colour = colours.Body; vehicle->colours.trim_colour = colours.Trim; - vehicle->colours_extended = colours.Ternary; + vehicle->colours_extended = colours.Tertiary; } } diff --git a/src/openrct2/scripting/bindings/ride/ScRide.hpp b/src/openrct2/scripting/bindings/ride/ScRide.hpp index a3c64d4a99..0c0a40e3ad 100644 --- a/src/openrct2/scripting/bindings/ride/ScRide.hpp +++ b/src/openrct2/scripting/bindings/ride/ScRide.hpp @@ -44,7 +44,7 @@ namespace OpenRCT2::Scripting DukObject obj(ctx); obj.Set("body", value.Body); obj.Set("trim", value.Trim); - obj.Set("ternary", value.Ternary); + obj.Set("ternary", value.Tertiary); return obj.Take(); } @@ -53,7 +53,7 @@ namespace OpenRCT2::Scripting VehicleColour result{}; result.Body = AsOrDefault(s["body"], 0); result.Trim = AsOrDefault(s["trim"], 0); - result.Ternary = AsOrDefault(s["ternary"], 0); + result.Tertiary = AsOrDefault(s["ternary"], 0); return result; } diff --git a/src/openrct2/world/Scenery.h b/src/openrct2/world/Scenery.h index 67fdda736b..aaaf3ea3b8 100644 --- a/src/openrct2/world/Scenery.h +++ b/src/openrct2/world/Scenery.h @@ -108,7 +108,7 @@ enum WALL_SCENERY_FLAGS WALL_SCENERY_IS_DOOR = (1 << 4), // 0x10 WALL_SCENERY_LONG_DOOR_ANIMATION = (1 << 5), // 0x20 WALL_SCENERY_HAS_SECONDARY_COLOUR = (1 << 6), // 0x40 - WALL_SCENERY_HAS_TERNARY_COLOUR = (1 << 7), // 0x80 + WALL_SCENERY_HAS_TERTIARY_COLOUR = (1 << 7), // 0x80 }; enum WALL_SCENERY_2_FLAGS