From 9134bd47887cb17cda3331ecb676fa5a4e44e5c3 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sat, 13 Nov 2021 23:38:04 +0100 Subject: [PATCH] =?UTF-8?q?Update=20RCT1=20path=20names=20+=20British=20sp?= =?UTF-8?q?elling=20for=20=E2=80=98grey=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawing/engines/HardwareDisplayDrawingEngine.cpp | 2 +- src/openrct2-ui/windows/Ride.cpp | 2 +- src/openrct2/core/Imaging.cpp | 2 +- src/openrct2/interface/Chat.cpp | 2 +- src/openrct2/interface/Colour.h | 12 ++++++------ src/openrct2/rct1/RCT1.h | 10 +++++----- src/openrct2/rct1/S4Importer.cpp | 2 +- src/openrct2/rct1/Tables.cpp | 10 +++++----- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp index 5fb9e20136..ad6fb0b453 100644 --- a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp @@ -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; diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 58ec57ca6d..59af8734c2 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -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). diff --git a/src/openrct2/core/Imaging.cpp b/src/openrct2/core/Imaging.cpp index 63339b2726..e27d072b57 100644 --- a/src/openrct2/core/Imaging.cpp +++ b/src/openrct2/core/Imaging.cpp @@ -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++) { diff --git a/src/openrct2/interface/Chat.cpp b/src/openrct2/interface/Chat.cpp index 27e52fae64..9c7d27036f 100644 --- a/src/openrct2/interface/Chat.cpp +++ b/src/openrct2/interface/Chat.cpp @@ -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); diff --git a/src/openrct2/interface/Colour.h b/src/openrct2/interface/Colour.h index e4f79b65dc..39e208e7b9 100644 --- a/src/openrct2/interface/Colour.h +++ b/src/openrct2/interface/Colour.h @@ -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) diff --git a/src/openrct2/rct1/RCT1.h b/src/openrct2/rct1/RCT1.h index 3fdf059ee0..be2d75bcb8 100644 --- a/src/openrct2/rct1/RCT1.h +++ b/src/openrct2/rct1/RCT1.h @@ -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, }; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 73df5ffe9a..33a8e422bb 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -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); diff --git a/src/openrct2/rct1/Tables.cpp b/src/openrct2/rct1/Tables.cpp index 344535359a..2db463a495 100644 --- a/src/openrct2/rct1/Tables.cpp +++ b/src/openrct2/rct1/Tables.cpp @@ -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 };