mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 09:32:29 +01:00
Code Issues Releases Wiki Activity

Fix spelling of ‘separate’ and ‘separator’

Browse Source
This commit is contained in:
Michael Steenbeek
2025-08-28 00:33:05 +02:00
committed by GitHub
parent 85a0f70ae1
commit dd957d46e8
6 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
distribution/openrct2.d.ts vendored
View File

@@ -4474,7 +4474,7 @@ declare global {
readonly category: RideResearchCategory;
/**
* The ride type. Each vehicle can have a seperate invention for each ride type.
* The ride type. Each vehicle can have a separate invention for each ride type.
*/
readonly rideType: number;
@@ -5056,7 +5056,7 @@ declare global {
column: number;
}
type ListViewItem = ListViewItemSeperator | string[] | string;
type ListViewItem = ListViewItemSeparator | string[] | string;
interface ListViewWidget extends WidgetBase {
type: "listview";
@@ -5183,8 +5183,8 @@ declare global {
textAlign?: TextAlignment;
}
interface ListViewItemSeperator {
type: "seperator";
interface ListViewItemSeparator {
type: "separator";
text?: string;
}

12
scripts/format-changelog.js
View File

@@ -6,7 +6,7 @@ const ChangeTypes = ["Headline feature", "Feature", "Improved", "Change", "Remov
const ChangeTypeSubstitutions = {
"Improve": "Improved",
};
const HeaderSeperator = "------------------------------------------------------------------------";
const HeaderSeparator = "------------------------------------------------------------------------";
function reportError(ctx, message) {
console.error(`Error on line ${ctx.lineIndex}: ${message}`);
@@ -42,10 +42,10 @@ function readVersionHeader(ctx) {
reportLineError(versionLine, "Expected a version number");
}
// Check the version seperator
const versionSeperator = consumeLine(ctx);
if (versionSeperator.text != HeaderSeperator) {
reportLineError(versionSeperator, "Expected version seperator");
// Check the version separator
const versionSeparator = consumeLine(ctx);
if (versionSeparator.text != HeaderSeparator) {
reportLineError(versionSeparator, "Expected version separator");
}
// Check for optional headline, this means the there is text not starting with - and an empty line before
@@ -263,7 +263,7 @@ function cleanupVersions(versions) {
function printChangelog(versions) {
for (const version of versions) {
console.log(`${version.version} (${version.date})`);
console.log(HeaderSeperator);
console.log(HeaderSeparator);
if (version.headline != "") {
console.log(version.headline);
console.log();

7
src/openrct2-ui/scripting/CustomListView.cpp
View File

@@ -125,7 +125,8 @@ namespace OpenRCT2::Scripting
else if (d.type() == DukValue::Type::OBJECT)
{
auto type = ProcessString(d["type"]);
if (type == "seperator")
// This type was misspelt between 2020 and 2025.
if (type == "separator" || type == "separator")
{
auto text = ProcessString(d["text"]);
result = ListViewItem(text);
@@ -584,7 +585,7 @@ void CustomListView::Paint(WindowBase* w, RenderTarget& rt, const ScrollArea* sc
{
const auto& text = item.Cells[0];
ScreenSize cellSize = { LastKnownSize.width, kListRowHeight };
PaintSeperator(rt, { 0, y }, cellSize, text.c_str());
PaintSeparator(rt, { 0, y }, cellSize, text.c_str());
}
else
{
@@ -703,7 +704,7 @@ void CustomListView::PaintHeading(
}
}
void CustomListView::PaintSeperator(RenderTarget& rt, const ScreenCoordsXY& pos, const ScreenSize& size, const char* text) const
void CustomListView::PaintSeparator(RenderTarget& rt, const ScreenCoordsXY& pos, const ScreenSize& size, const char* text) const
{
auto hasText = text != nullptr && text[0] != '\0';
auto left = pos.x + 4;

2
src/openrct2-ui/scripting/CustomListView.h
View File

@@ -144,7 +144,7 @@ namespace OpenRCT2::Ui::Windows
void PaintHeading(
WindowBase* w, RenderTarget& rt, const ScreenCoordsXY& pos, const ScreenSize& size, const std::string& text,
ColumnSortOrder sortOrder, bool isPressed) const;
void PaintSeperator(RenderTarget& rt, const ScreenCoordsXY& pos, const ScreenSize& size, const char* text) const;
void PaintSeparator(RenderTarget& rt, const ScreenCoordsXY& pos, const ScreenSize& size, const char* text) const;
void PaintCell(
RenderTarget& rt, const ScreenCoordsXY& pos, const ScreenSize& size, const char* text, bool isHighlighted) const;
std::optional<RowColumn> GetItemIndexAt(const ScreenCoordsXY& pos);

2
src/openrct2/scripting/bindings/world/ScTileElement.cpp
View File

@@ -1584,7 +1584,7 @@ namespace OpenRCT2::Scripting
}
}
// Deprecated in favor of seperate 'edges' and 'corners' properties,
// Deprecated in favor of separate 'edges' and 'corners' properties,
// left here to maintain compatibility with older plugins.
/** @deprecated */
uint8_t ScTileElement::edgesAndCorners_get() const

2
src/openrct2/scripting/bindings/world/ScTileElement.hpp
View File

@@ -145,7 +145,7 @@ namespace OpenRCT2::Scripting
DukValue bannerIndex_get() const;
void bannerIndex_set(const DukValue& value);
// Deprecated in favor of seperate 'edges' and 'corners' properties,
// Deprecated in favor of separate 'edges' and 'corners' properties,
// left here to maintain compatibility with older plugins.
/** @deprecated */
uint8_t edgesAndCorners_get() const;