mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 23:34:37 +01:00
Code Issues Releases Wiki Activity

Change "ternary" to "tertiary" (#21582)

Browse Source
This commit is contained in:
Peter Froud
2024-03-11 04:42:54 -07:00
committed by GitHub
parent 988162e125
commit 1e51925968
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/openrct2-ui/windows/Ride.cpp
View File

@@ -188,7 +188,7 @@ enum {
WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN,
WIDX_VEHICLE_BODY_COLOUR,
WIDX_VEHICLE_TRIM_COLOUR,
WIDX_VEHICLE_TERNARY_COLOUR,
WIDX_VEHICLE_TERTIARY_COLOUR,
WIDX_SELL_ITEM_RANDOM_COLOUR_CHECKBOX,
WIDX_PLAY_MUSIC = 14,
@@ -4277,7 +4277,7 @@ static_assert(std::size(RatingNames) == 6);
vehicleColour = RideGetVehicleColour(*ride, _vehicleIndex);
WindowDropdownShowColour(this, &widgets[widgetIndex], colours[1], vehicleColour.Trim);
break;
case WIDX_VEHICLE_TERNARY_COLOUR:
case WIDX_VEHICLE_TERTIARY_COLOUR:
vehicleColour = RideGetVehicleColour(*ride, _vehicleIndex);
WindowDropdownShowColour(this, &widgets[widgetIndex], colours[1], vehicleColour.Tertiary);
break;
@@ -4371,10 +4371,10 @@ static_assert(std::size(RatingNames) == 6);
GameActions::Execute(&rideSetAppearanceAction);
}
break;
case WIDX_VEHICLE_TERNARY_COLOUR:
case WIDX_VEHICLE_TERTIARY_COLOUR:
{
auto rideSetAppearanceAction = RideSetAppearanceAction(
rideId, RideSetAppearanceType::VehicleColourTernary, ColourDropDownIndexToColour(dropdownIndex),
rideId, RideSetAppearanceType::VehicleColourTertiary, ColourDropDownIndexToColour(dropdownIndex),
_vehicleIndex);
GameActions::Execute(&rideSetAppearanceAction);
}
@@ -4557,7 +4557,7 @@ static_assert(std::size(RatingNames) == 6);
widgets[WIDX_VEHICLE_BODY_COLOUR].image = GetColourButtonImage(vehicleColour.Body);
bool allowChangingTrimColour = false;
bool allowChangingTernaryColour = false;
bool allowChangingTertiaryColour = false;
for (int32_t i = 0; i < ride->num_cars_per_train; i++)
{
@@ -4567,9 +4567,9 @@ static_assert(std::size(RatingNames) == 6);
{
allowChangingTrimColour = true;
}
if (rideEntry->Cars[vehicleTypeIndex].flags & CAR_ENTRY_FLAG_ENABLE_TERNARY_COLOUR)
if (rideEntry->Cars[vehicleTypeIndex].flags & CAR_ENTRY_FLAG_ENABLE_TERTIARY_COLOUR)
{
allowChangingTernaryColour = true;
allowChangingTertiaryColour = true;
}
}
@@ -4578,20 +4578,20 @@ static_assert(std::size(RatingNames) == 6);
{
widgets[WIDX_VEHICLE_TRIM_COLOUR].type = WindowWidgetType::ColourBtn;
widgets[WIDX_VEHICLE_TRIM_COLOUR].image = GetColourButtonImage(vehicleColour.Trim);
if (allowChangingTernaryColour)
if (allowChangingTertiaryColour)
{
widgets[WIDX_VEHICLE_TERNARY_COLOUR].type = WindowWidgetType::ColourBtn;
widgets[WIDX_VEHICLE_TERNARY_COLOUR].image = GetColourButtonImage(vehicleColour.Tertiary);
widgets[WIDX_VEHICLE_TERTIARY_COLOUR].type = WindowWidgetType::ColourBtn;
widgets[WIDX_VEHICLE_TERTIARY_COLOUR].image = GetColourButtonImage(vehicleColour.Tertiary);
}
else
{
widgets[WIDX_VEHICLE_TERNARY_COLOUR].type = WindowWidgetType::Empty;
widgets[WIDX_VEHICLE_TERTIARY_COLOUR].type = WindowWidgetType::Empty;
}
}
else
{
widgets[WIDX_VEHICLE_TRIM_COLOUR].type = WindowWidgetType::Empty;
widgets[WIDX_VEHICLE_TERNARY_COLOUR].type = WindowWidgetType::Empty;
widgets[WIDX_VEHICLE_TERTIARY_COLOUR].type = WindowWidgetType::Empty;
}
// Vehicle colour scheme type
@@ -4636,7 +4636,7 @@ static_assert(std::size(RatingNames) == 6);
widgets[WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN].type = WindowWidgetType::Empty;
widgets[WIDX_VEHICLE_BODY_COLOUR].type = WindowWidgetType::Empty;
widgets[WIDX_VEHICLE_TRIM_COLOUR].type = WindowWidgetType::Empty;
widgets[WIDX_VEHICLE_TERNARY_COLOUR].type = WindowWidgetType::Empty;
widgets[WIDX_VEHICLE_TERTIARY_COLOUR].type = WindowWidgetType::Empty;
}
ft.Rewind();

2
src/openrct2-ui/windows/Scenery.cpp
View File

@@ -88,7 +88,7 @@ static Widget WindowSceneryBaseWidgets[] = {
MakeWidget ({609, 83}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, ImageId(SPR_PAINTBRUSH), STR_SCENERY_PAINTBRUSH_TIP ), // 4000000 0x009DE438
MakeWidget ({615, 108}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_COLOUR ), // 8000000 0x009DE448
MakeWidget ({615, 120}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_SECONDARY_COLOUR), // 10000000 0x009DE458
MakeWidget ({615, 132}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_TERNARY_COLOUR ), // 20000000 0x009DE468
MakeWidget ({615, 132}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_TERTIARY_COLOUR ), // 20000000 0x009DE468
MakeWidget ({609, 145}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, ImageId(SPR_G2_EYEDROPPER), STR_SCENERY_EYEDROPPER_TIP ), // 40000000 0x009DE478
MakeWidget ({609, 169}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, ImageId(SPR_SCENERY_CLUSTER), STR_SCENERY_CLUSTER_TIP ), // 40000000 0x009DE478
MakeWidget ({ 4, 46}, {211, 14}, WindowWidgetType::TextBox, WindowColour::Secondary ),

4
src/openrct2/actions/RideSetAppearanceAction.cpp
View File

@@ -71,7 +71,7 @@ GameActions::Result RideSetAppearanceAction::Query() const
break;
case RideSetAppearanceType::VehicleColourBody:
case RideSetAppearanceType::VehicleColourTrim:
case RideSetAppearanceType::VehicleColourTernary:
case RideSetAppearanceType::VehicleColourTertiary:
if (_index >= std::size(ride->vehicle_colours))
{
LOG_WARNING("Invalid game command, index %d out of bounds", _index);
@@ -123,7 +123,7 @@ GameActions::Result RideSetAppearanceAction::Execute() const
ride->vehicle_colours[_index].Trim = _value;
RideUpdateVehicleColours(*ride);
break;
case RideSetAppearanceType::VehicleColourTernary:
case RideSetAppearanceType::VehicleColourTertiary:
ride->vehicle_colours[_index].Tertiary = _value;
RideUpdateVehicleColours(*ride);
break;

2
src/openrct2/actions/RideSetAppearanceAction.h
View File

@@ -19,7 +19,7 @@ enum class RideSetAppearanceType : uint8_t
MazeStyle = TrackColourSupports,
VehicleColourBody,
VehicleColourTrim,
VehicleColourTernary,
VehicleColourTertiary,
VehicleColourScheme,
EntranceStyle,
SellingItemColourIsRandom

2
src/openrct2/localisation/StringIds.h
View File

@@ -2286,7 +2286,7 @@ enum : uint16_t
// STR_3098 :Can't change lift hill speed...
STR_SELECT_COLOUR = 3099,
STR_SELECT_SECONDARY_COLOUR = 3100,
STR_SELECT_TERNARY_COLOUR = 3101,
STR_SELECT_TERTIARY_COLOUR = 3101,
STR_SCENERY_PAINTBRUSH_TIP = 3102,
STR_CANT_REPAINT_THIS = 3103,
STR_LIST_RIDES_TIP = 3104,

2
src/openrct2/object/RideObject.cpp
View File

@@ -818,7 +818,7 @@ CarEntry RideObject::ReadJsonCar([[maybe_unused]] IReadObjectContext* context, j
{ "isReverserPassengerCar", CAR_ENTRY_FLAG_REVERSER_PASSENGER_CAR },
{ "hasInvertedSpriteSet", CAR_ENTRY_FLAG_HAS_INVERTED_SPRITE_SET },
{ "hasDodgemInUseLights", CAR_ENTRY_FLAG_DODGEM_INUSE_LIGHTS },
{ "hasAdditionalColour2", CAR_ENTRY_FLAG_ENABLE_TERNARY_COLOUR },
{ "hasAdditionalColour2", CAR_ENTRY_FLAG_ENABLE_TERTIARY_COLOUR },
{ "recalculateSpriteBounds", CAR_ENTRY_FLAG_RECALCULATE_SPRITE_BOUNDS },
{ "overrideNumberOfVerticalFrames", CAR_ENTRY_FLAG_OVERRIDE_NUM_VERTICAL_FRAMES },
{ "spriteBoundsIncludeInvertedSet", CAR_ENTRY_FLAG_SPRITE_BOUNDS_INCLUDE_INVERTED_SET },

2
src/openrct2/ride/CarEntry.h
View File

@@ -50,7 +50,7 @@ enum : uint32_t
CAR_ENTRY_FLAG_DODGEM_INUSE_LIGHTS = 1
<< 7, // When set the vehicle has an additional frame for when in use. Used only by dodgems.
CAR_ENTRY_FLAG_ALLOW_DOORS_DEPRECATED = 1 << 8, // Not used any more - every vehicle will now work with doors.
CAR_ENTRY_FLAG_ENABLE_TERNARY_COLOUR = 1 << 9,
CAR_ENTRY_FLAG_ENABLE_TERTIARY_COLOUR = 1 << 9,
CAR_ENTRY_FLAG_RECALCULATE_SPRITE_BOUNDS = 1 << 10, // Only used during loading of the objects.
CAR_ENTRY_FLAG_USE_16_ROTATION_FRAMES = 1
<< 11, // Instead of the default 32 rotation frames. Only used for boat hire and works only for non sloped sprites.