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

Update RCT1 path names + British spelling for ‘grey’

This commit is contained in:
Michael Steenbeek 2021-11-13 23:38:04 +01:00 committed by GitHub
parent c0f928f51d
commit 9134bd4788
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp
View File

@ -385,7 +385,7 @@ private:
{
ReadCentrePixel(&_pixelAfterOverlay);
// Detect an active Steam overlay by checking if the centre pixel is changed by the gray fade.
// Detect an active Steam overlay by checking if the centre pixel is changed by the grey fade.
// Will not be triggered by applications rendering to corners, like FRAPS, MSI Afterburner and Friends popups.
bool newOverlayActive = _pixelBeforeOverlay != _pixelAfterOverlay;

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

@ -6220,7 +6220,7 @@ static void window_ride_graphs_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi
const bool previousMeasurement = x > measurement->current_item;
// Draw the current line in gray.
// Draw the current line in grey.
gfx_fill_rect(dpi, { { x, top }, { x, bottom } }, previousMeasurement ? PALETTE_INDEX_17 : PALETTE_INDEX_21);
// Draw red over extreme values (if supported by graph type).

2
src/openrct2/core/Imaging.cpp
View File

@ -124,7 +124,7 @@ namespace Imaging
}
else if (bitDepth == 8 && !expandTo32)
{
// 8-bit paletted or grayscale
// 8-bit paletted or greyscale
Guard::Assert(rowBytes == pngWidth, GUARD_LINE);
for (png_uint_32 i = 0; i < pngHeight; i++)
{

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

@ -143,7 +143,7 @@ void chat_draw(rct_drawpixelinfo* dpi, uint8_t chatBackgroundColor)
{ topLeft - ScreenCoordsXY{ 0, 5 }, bottomRight + ScreenCoordsXY{ 0, 5 } }); // Background area + Textbox
gfx_filter_rect(
dpi, { topLeft - ScreenCoordsXY{ 0, 5 }, bottomRight + ScreenCoordsXY{ 0, 5 } },
FilterPaletteID::Palette51); // Opaque gray background
FilterPaletteID::Palette51); // Opaque grey background
gfx_fill_rect_inset(
dpi, { topLeft - ScreenCoordsXY{ 0, 5 }, bottomRight + ScreenCoordsXY{ 0, 5 } }, chatBackgroundColor,
INSET_RECT_FLAG_FILL_NONE);

12
src/openrct2/interface/Colour.h
View File

@ -68,15 +68,15 @@ enum
enum : uint8_t
{
PALETTE_INDEX_0 = 0, // Transparent
PALETTE_INDEX_10 = 10, // Black (0-dark), Dark gray (0)
PALETTE_INDEX_10 = 10, // Black (0-dark), Dark grey (0)
PALETTE_INDEX_11 = 11, // Black (middark)
PALETTE_INDEX_12 = 12, // Black (midlight), Dark gray (1-darkest)
PALETTE_INDEX_14 = 14, // Black (lighter), Dark gray (dark)
PALETTE_INDEX_12 = 12, // Black (midlight), Dark grey (1-darkest)
PALETTE_INDEX_14 = 14, // Black (lighter), Dark grey (dark)
PALETTE_INDEX_13 = 13, //
PALETTE_INDEX_16 = 16, //
PALETTE_INDEX_17 = 17, // Black (11), Dark gray (light), White (dark)
PALETTE_INDEX_20 = 20, // Dark gray (10), White (light)
PALETTE_INDEX_21 = 21, // Dark gray (11), White (lighter-11)
PALETTE_INDEX_17 = 17, // Black (11), Dark grey (light), White (dark)
PALETTE_INDEX_20 = 20, // Dark grey (10), White (light)
PALETTE_INDEX_21 = 21, // Dark grey (11), White (lighter-11)
PALETTE_INDEX_40 = 40, //
PALETTE_INDEX_42 = 42, // Light Brown (lighter), Saturated brown (11)
PALETTE_INDEX_46 = 46, // Tertiary remap 0 / Yellow (darkest)

10
src/openrct2/rct1/RCT1.h
View File

@ -1010,20 +1010,20 @@ namespace RCT1
RCT1_FOOTPATH_TYPE_QUEUE_YELLOW,
RCT1_FOOTPATH_TYPE_QUEUE_GREEN,
RCT1_FOOTPATH_TYPE_TARMAC_GRAY,
RCT1_FOOTPATH_TYPE_TARMAC_GREY,
RCT1_FOOTPATH_TYPE_TARMAC_RED,
RCT1_FOOTPATH_TYPE_TARMAC_BROWN,
RCT1_FOOTPATH_TYPE_TARMAC_GREEN,
RCT1_FOOTPATH_TYPE_DIRT_RED,
RCT1_FOOTPATH_TYPE_DIRT_BROWN,
RCT1_FOOTPATH_TYPE_DIRT_BLACK,
RCT1_FOOTPATH_TYPE_CRAZY_PAVING = 12,
RCT1_FOOTPATH_TYPE_ROADS = 16,
RCT1_FOOTPATH_TYPE_ROAD = 16,
RCT1_FOOTPATH_TYPE_TILE_PINK = 20,
RCT1_FOOTPATH_TYPE_TILE_GRAY,
RCT1_FOOTPATH_TYPE_TILE_BROWN = 20,
RCT1_FOOTPATH_TYPE_TILE_GREY,
RCT1_FOOTPATH_TYPE_TILE_RED,
RCT1_FOOTPATH_TYPE_TILE_GREEN,
};

2
src/openrct2/rct1/S4Importer.cpp
View File

@ -1711,7 +1711,7 @@ namespace RCT1
auto pathType = src2->GetPathType();
if (pathType == 0)
{
pathType = RCT1_FOOTPATH_TYPE_TARMAC_GRAY;
pathType = RCT1_FOOTPATH_TYPE_TARMAC_GREY;
}
auto entryIndex = _pathTypeToEntryMap[pathType];
dst2->SetLegacyPathEntryIndex(entryIndex & 0x7F);

10
src/openrct2/rct1/Tables.cpp
View File

@ -1265,12 +1265,12 @@ namespace RCT1
"PATHDIRT", // RCT1_FOOTPATH_TYPE_QUEUE_YELLOW
"TARMACG ", // RCT1_FOOTPATH_TYPE_QUEUE_GREEN
"TARMAC ", // RCT1_FOOTPATH_TYPE_TARMAC_GRAY
"TARMAC ", // RCT1_FOOTPATH_TYPE_TARMAC_GREY
"PATHSPCE", // RCT1_FOOTPATH_TYPE_TARMAC_RED
"TARMACB ", // RCT1_FOOTPATH_TYPE_TARMAC_BROWN
"TARMACG ", // RCT1_FOOTPATH_TYPE_TARMAC_GREEN
"PATHDIRT", // RCT1_FOOTPATH_TYPE_DIRT_RED
"PATHDIRT", // RCT1_FOOTPATH_TYPE_DIRT_BROWN
"PATHASH ", // RCT1_FOOTPATH_TYPE_DIRT_BLACK
" ",
" ",
@ -1280,13 +1280,13 @@ namespace RCT1
" ",
" ",
"ROAD ", // RCT1_FOOTPATH_TYPE_ROADS
"ROAD ", // RCT1_FOOTPATH_TYPE_ROAD
" ",
" ",
" ",
"PATHCRZY", // RCT1_FOOTPATH_TYPE_TILE_PINK
"PATHCRZY", // RCT1_FOOTPATH_TYPE_TILE_GRAY
"PATHCRZY", // RCT1_FOOTPATH_TYPE_TILE_BROWN
"PATHCRZY", // RCT1_FOOTPATH_TYPE_TILE_GREY
"PATHCRZY", // RCT1_FOOTPATH_TYPE_TILE_RED
"PATHCRZY", // RCT1_FOOTPATH_TYPE_TILE_GREEN
};