mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix spelling of *_COLOR_* constants

This commit is contained in:
Michael Steenbeek 2022-11-23 19:42:14 +01:00 committed by GitHub
parent 06b9dacfaf
commit 9855ff5cac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/openrct2-ui/windows/Banner.cpp
View File

@ -40,20 +40,20 @@ enum WindowBannerWidgetIdx {
};
static constexpr const StringId BannerColouredTextFormats[] = {
STR_TEXT_COLOR_BLACK,
STR_TEXT_COLOR_GREY,
STR_TEXT_COLOR_WHITE,
STR_TEXT_COLOR_RED,
STR_TEXT_COLOR_GREEN,
STR_TEXT_COLOR_YELLOW,
STR_TEXT_COLOR_TOPAZ,
STR_TEXT_COLOR_CELADON,
STR_TEXT_COLOR_BABYBLUE,
STR_TEXT_COLOR_PALELAVENDER,
STR_TEXT_COLOR_PALEGOLD,
STR_TEXT_COLOR_LIGHTPINK,
STR_TEXT_COLOR_PEARLAQUA,
STR_TEXT_COLOR_PALESILVER,
STR_TEXT_COLOUR_BLACK,
STR_TEXT_COLOUR_GREY,
STR_TEXT_COLOUR_WHITE,
STR_TEXT_COLOUR_RED,
STR_TEXT_COLOUR_GREEN,
STR_TEXT_COLOUR_YELLOW,
STR_TEXT_COLOUR_TOPAZ,
STR_TEXT_COLOUR_CELADON,
STR_TEXT_COLOUR_BABYBLUE,
STR_TEXT_COLOUR_PALELAVENDER,
STR_TEXT_COLOUR_PALEGOLD,
STR_TEXT_COLOUR_LIGHTPINK,
STR_TEXT_COLOUR_PEARLAQUA,
STR_TEXT_COLOUR_PALESILVER,
};
static rct_widget window_banner_widgets[] = {

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

@ -185,7 +185,7 @@ enum {
WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN,
WIDX_VEHICLE_COLOUR_INDEX,
WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN,
WIDX_VEHICLE_BODY_COLOR,
WIDX_VEHICLE_BODY_COLOUR,
WIDX_VEHICLE_TRIM_COLOUR,
WIDX_VEHICLE_TERNARY_COLOUR,
WIDX_SELL_ITEM_RANDOM_COLOUR_CHECKBOX,
@ -4446,7 +4446,7 @@ static void WindowRideColourMousedown(rct_window* w, WidgetIndex widgetIndex, rc
Dropdown::SetChecked(w->vehicleIndex, true);
break;
case WIDX_VEHICLE_BODY_COLOR:
case WIDX_VEHICLE_BODY_COLOUR:
vehicleColour = ride_get_vehicle_colour(ride, w->vehicleIndex);
WindowDropdownShowColour(w, widget, w->colours[1], vehicleColour.Body);
break;
@ -4543,7 +4543,7 @@ static void WindowRideColourDropdown(rct_window* w, WidgetIndex widgetIndex, int
w->vehicleIndex = dropdownIndex;
w->Invalidate();
break;
case WIDX_VEHICLE_BODY_COLOR:
case WIDX_VEHICLE_BODY_COLOUR:
{
auto rideSetAppearanceAction = RideSetAppearanceAction(
rideId, RideSetAppearanceType::VehicleColourBody, dropdownIndex, w->vehicleIndex);
@ -4754,8 +4754,8 @@ static void WindowRideColourInvalidate(rct_window* w)
vehicleColour = ride_get_vehicle_colour(ride, w->vehicleIndex);
window_ride_colour_widgets[WIDX_VEHICLE_PREVIEW].type = WindowWidgetType::Scroll;
window_ride_colour_widgets[WIDX_VEHICLE_BODY_COLOR].type = WindowWidgetType::ColourBtn;
window_ride_colour_widgets[WIDX_VEHICLE_BODY_COLOR].image = GetColourButtonImage(vehicleColour.Body).ToUInt32();
window_ride_colour_widgets[WIDX_VEHICLE_BODY_COLOUR].type = WindowWidgetType::ColourBtn;
window_ride_colour_widgets[WIDX_VEHICLE_BODY_COLOUR].image = GetColourButtonImage(vehicleColour.Body).ToUInt32();
bool allowChangingTrimColour = false;
bool allowChangingTernaryColour = false;
@ -4837,7 +4837,7 @@ static void WindowRideColourInvalidate(rct_window* w)
window_ride_colour_widgets[WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_VEHICLE_COLOUR_INDEX].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_VEHICLE_BODY_COLOR].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_VEHICLE_BODY_COLOUR].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_VEHICLE_TRIM_COLOUR].type = WindowWidgetType::Empty;
window_ride_colour_widgets[WIDX_VEHICLE_TERNARY_COLOUR].type = WindowWidgetType::Empty;
}

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

@ -2197,20 +2197,20 @@ enum : uint16_t
STR_SIGN_TEXT_PROMPT = 2993,
STR_CHANGE_SIGN_TEXT_TIP = 2994,
STR_DEMOLISH_SIGN_TIP = 2995,
STR_TEXT_COLOR_BLACK = 2996,
STR_TEXT_COLOR_GREY = 2997,
STR_TEXT_COLOR_WHITE = 2998,
STR_TEXT_COLOR_RED = 2999,
STR_TEXT_COLOR_GREEN = 3000,
STR_TEXT_COLOR_YELLOW = 3001,
STR_TEXT_COLOR_TOPAZ = 3002,
STR_TEXT_COLOR_CELADON = 3003,
STR_TEXT_COLOR_BABYBLUE = 3004,
STR_TEXT_COLOR_PALELAVENDER = 3005,
STR_TEXT_COLOR_PALEGOLD = 3006,
STR_TEXT_COLOR_LIGHTPINK = 3007,
STR_TEXT_COLOR_PEARLAQUA = 3008,
STR_TEXT_COLOR_PALESILVER = 3009,
STR_TEXT_COLOUR_BLACK = 2996,
STR_TEXT_COLOUR_GREY = 2997,
STR_TEXT_COLOUR_WHITE = 2998,
STR_TEXT_COLOUR_RED = 2999,
STR_TEXT_COLOUR_GREEN = 3000,
STR_TEXT_COLOUR_YELLOW = 3001,
STR_TEXT_COLOUR_TOPAZ = 3002,
STR_TEXT_COLOUR_CELADON = 3003,
STR_TEXT_COLOUR_BABYBLUE = 3004,
STR_TEXT_COLOUR_PALELAVENDER = 3005,
STR_TEXT_COLOUR_PALEGOLD = 3006,
STR_TEXT_COLOUR_LIGHTPINK = 3007,
STR_TEXT_COLOUR_PEARLAQUA = 3008,
STR_TEXT_COLOUR_PALESILVER = 3009,
STR_UNABLE_TO_LOAD_FILE = 3010,
STR_FILE_CONTAINS_INVALID_DATA = 3011,
STR_MUSIC_STYLE_DODGEMS_BEAT = 3012,