From 57e65f588852e47cf234bde390aa18b27c6f4df8 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Tue, 7 Oct 2025 20:29:20 +0200 Subject: [PATCH] Rename members of RCT2LanguageId --- src/openrct2/Game.cpp | 2 +- src/openrct2/localisation/Language.h | 32 ++++++++++---------- src/openrct2/object/StringTable.cpp | 4 +-- src/openrct2/rct1/S4Importer.cpp | 4 +-- src/openrct2/rct12/CSStringConverter.cpp | 8 ++--- src/openrct2/rct12/RCT12.cpp | 2 +- src/openrct2/rct2/S6Importer.cpp | 10 +++--- src/openrct2/scenario/ScenarioRepository.cpp | 4 +-- test/tests/LocalisationTest.cpp | 10 +++--- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index d309e0f81d..fb037c21d6 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -184,7 +184,7 @@ void RCT2StringToUTF8Self(char* buffer, size_t length) { if (length > 0) { - auto temp = RCT2StringToUTF8(buffer, RCT2LanguageId::EnglishUK); + auto temp = RCT2StringToUTF8(buffer, RCT2LanguageId::englishUK); String::safeUtf8Copy(buffer, temp.data(), length); } } diff --git a/src/openrct2/localisation/Language.h b/src/openrct2/localisation/Language.h index 187dc1decf..6501c9c236 100644 --- a/src/openrct2/localisation/Language.h +++ b/src/openrct2/localisation/Language.h @@ -53,22 +53,22 @@ namespace OpenRCT2 enum class RCT2LanguageId : uint8_t { - EnglishUK, - EnglishUS, - French, - German, - Spanish, - Italian, - Dutch, - Swedish, - Japanese, - Korean, - ChineseSimplified, - ChineseTraditional, - Undefined, - Portuguese, - Blank = 254, - End = 255 + englishUK, + englishUS, + french, + german, + spanish, + italian, + dutch, + swedish, + japanese, + korean, + chineseSimplified, + chineseTraditional, + undefined, + portuguese, + blank = 254, + end = 255 }; struct LanguageDescriptor diff --git a/src/openrct2/object/StringTable.cpp b/src/openrct2/object/StringTable.cpp index 8b1c198ca7..9ff319a6af 100644 --- a/src/openrct2/object/StringTable.cpp +++ b/src/openrct2/object/StringTable.cpp @@ -55,9 +55,9 @@ namespace OpenRCT2 try { RCT2LanguageId rct2LanguageId; - while ((rct2LanguageId = static_cast(stream->ReadValue())) != RCT2LanguageId::End) + while ((rct2LanguageId = static_cast(stream->ReadValue())) != RCT2LanguageId::end) { - uint8_t languageId = (EnumValue(rct2LanguageId) <= EnumValue(RCT2LanguageId::Portuguese)) + uint8_t languageId = (EnumValue(rct2LanguageId) <= EnumValue(RCT2LanguageId::portuguese)) ? RCT2ToOpenRCT2LanguageId[EnumValue(rct2LanguageId)] : static_cast(LANGUAGE_UNDEFINED); std::string stringAsWin1252 = stream->ReadString(); diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index c6e4eba2c2..c9541fe04c 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -254,7 +254,7 @@ namespace OpenRCT2::RCT1 dst->ObjectiveArg3 = GetBuildTheBestRideId(); } - std::string name = RCT2StringToUTF8(_s4.ScenarioName, RCT2LanguageId::EnglishUK); + std::string name = RCT2StringToUTF8(_s4.ScenarioName, RCT2LanguageId::englishUK); std::string details; // TryGetById won't set this property if the scenario is not recognised, @@ -2614,7 +2614,7 @@ namespace OpenRCT2::RCT1 const auto originalString = _s4.StringTable[stringId % 1024]; auto originalStringView = std::string_view( originalString, RCT12::GetRCTStringBufferLen(originalString, kUserStringMaxLength)); - auto asUtf8 = RCT2StringToUTF8(originalStringView, RCT2LanguageId::EnglishUK); + auto asUtf8 = RCT2StringToUTF8(originalStringView, RCT2LanguageId::englishUK); auto justText = RCT12RemoveFormattingUTF8(asUtf8); return justText.data(); } diff --git a/src/openrct2/rct12/CSStringConverter.cpp b/src/openrct2/rct12/CSStringConverter.cpp index 6d4a96d390..39b0644d1d 100644 --- a/src/openrct2/rct12/CSStringConverter.cpp +++ b/src/openrct2/rct12/CSStringConverter.cpp @@ -204,13 +204,13 @@ namespace OpenRCT2 { switch (languageId) { - case RCT2LanguageId::Japanese: + case RCT2LanguageId::japanese: return CodePage::CP_932; - case RCT2LanguageId::ChineseSimplified: + case RCT2LanguageId::chineseSimplified: return CodePage::CP_936; - case RCT2LanguageId::Korean: + case RCT2LanguageId::korean: return CodePage::CP_949; - case RCT2LanguageId::ChineseTraditional: + case RCT2LanguageId::chineseTraditional: return CodePage::CP_950; default: return CodePage::CP_1252; diff --git a/src/openrct2/rct12/RCT12.cpp b/src/openrct2/rct12/RCT12.cpp index cabc1b46e2..68d4cf10bf 100644 --- a/src/openrct2/rct12/RCT12.cpp +++ b/src/openrct2/rct12/RCT12.cpp @@ -642,7 +642,7 @@ std::string ConvertFormattedStringToOpenRCT2(std::string_view buffer) { buffer = buffer.substr(0, nullTerminator); } - auto asUtf8 = RCT2StringToUTF8(buffer, RCT2LanguageId::EnglishUK); + auto asUtf8 = RCT2StringToUTF8(buffer, RCT2LanguageId::englishUK); std::string result; CodepointView codepoints(asUtf8); diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index c86d94d6de..184e8c0917 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -329,7 +329,7 @@ namespace OpenRCT2::RCT2 // Some scenarios have their scenario details in UTF-8, due to earlier bugs in OpenRCT2. auto loadMaybeUTF8 = [](std::string_view str) -> std::string { - return !IsLikelyUTF8(str) ? RCT2StringToUTF8(str, RCT2LanguageId::EnglishUK) : std::string(str); + return !IsLikelyUTF8(str) ? RCT2StringToUTF8(str, RCT2LanguageId::englishUK) : std::string(str); }; if (_s6.Header.Type == S6_TYPE_SCENARIO) @@ -617,9 +617,9 @@ namespace OpenRCT2::RCT2 void ConvertScenarioStringsToUTF8(GameState_t& gameState) { // Scenario details - gameState.scenarioCompletedBy = RCT2StringToUTF8(gameState.scenarioCompletedBy, RCT2LanguageId::EnglishUK); - gameState.scenarioOptions.name = RCT2StringToUTF8(gameState.scenarioOptions.name, RCT2LanguageId::EnglishUK); - gameState.scenarioOptions.details = RCT2StringToUTF8(gameState.scenarioOptions.details, RCT2LanguageId::EnglishUK); + gameState.scenarioCompletedBy = RCT2StringToUTF8(gameState.scenarioCompletedBy, RCT2LanguageId::englishUK); + gameState.scenarioOptions.name = RCT2StringToUTF8(gameState.scenarioOptions.name, RCT2LanguageId::englishUK); + gameState.scenarioOptions.details = RCT2StringToUTF8(gameState.scenarioOptions.details, RCT2LanguageId::englishUK); } void ImportRides() @@ -1820,7 +1820,7 @@ namespace OpenRCT2::RCT2 const auto originalString = _s6.CustomStrings[stringId % 1024]; auto originalStringView = std::string_view( originalString, RCT12::GetRCTStringBufferLen(originalString, kUserStringMaxLength)); - auto asUtf8 = RCT2StringToUTF8(originalStringView, RCT2LanguageId::EnglishUK); + auto asUtf8 = RCT2StringToUTF8(originalStringView, RCT2LanguageId::englishUK); auto justText = RCT12RemoveFormattingUTF8(asUtf8); return justText.data(); } diff --git a/src/openrct2/scenario/ScenarioRepository.cpp b/src/openrct2/scenario/ScenarioRepository.cpp index 94c7ba5aa5..52719352f2 100644 --- a/src/openrct2/scenario/ScenarioRepository.cpp +++ b/src/openrct2/scenario/ScenarioRepository.cpp @@ -621,7 +621,7 @@ private: // Check if legacy highscore is better if (scBasic.CompanyValue > highscore->company_value) { - std::string name = RCT2StringToUTF8(scBasic.CompletedBy, RCT2LanguageId::EnglishUK); + std::string name = RCT2StringToUTF8(scBasic.CompletedBy, RCT2LanguageId::englishUK); highscore->name = name; highscore->company_value = scBasic.CompanyValue; highscore->timestamp = kDatetime64Min; @@ -633,7 +633,7 @@ private: { ScenarioHighscoreEntry* highscore = InsertHighscore(); highscore->fileName = scBasic.Path; - std::string name = RCT2StringToUTF8(scBasic.CompletedBy, RCT2LanguageId::EnglishUK); + std::string name = RCT2StringToUTF8(scBasic.CompletedBy, RCT2LanguageId::englishUK); highscore->name = name; highscore->company_value = scBasic.CompanyValue; highscore->timestamp = kDatetime64Min; diff --git a/test/tests/LocalisationTest.cpp b/test/tests/LocalisationTest.cpp index 0e842a972e..5e0fa06de5 100644 --- a/test/tests/LocalisationTest.cpp +++ b/test/tests/LocalisationTest.cpp @@ -27,7 +27,7 @@ TEST_F(Localisation, RCT2_to_UTF8_UK) { auto input = "The quick brown fox"; auto expected = u8"The quick brown fox"; - auto actual = RCT2StringToUTF8(input, RCT2LanguageId::EnglishUK); + auto actual = RCT2StringToUTF8(input, RCT2LanguageId::englishUK); ASSERT_EQ(expected, actual); } @@ -35,7 +35,7 @@ TEST_F(Localisation, RCT2_to_UTF8_JP) { auto input = StringFromHex("ff8374ff8340ff8358ff8367ff8375ff8389ff8345ff8393ff8374ff8348ff8362ff834eff8358"); auto expected = u8"ファストブラウンフォックス"; - auto actual = RCT2StringToUTF8(input, RCT2LanguageId::Japanese); + auto actual = RCT2StringToUTF8(input, RCT2LanguageId::japanese); ASSERT_EQ(expected, actual); } @@ -43,7 +43,7 @@ TEST_F(Localisation, RCT2_to_UTF8_ZH_TW) { auto input = StringFromHex("ffa7d6ffb374ffaabaffb4c4ffa6e2ffaab0ffaf57"); auto expected = u8"快速的棕色狐狸"; - auto actual = RCT2StringToUTF8(input, RCT2LanguageId::ChineseTraditional); + auto actual = RCT2StringToUTF8(input, RCT2LanguageId::chineseTraditional); ASSERT_EQ(expected, actual); } @@ -51,7 +51,7 @@ TEST_F(Localisation, RCT2_to_UTF8_PL) { auto input = StringFromHex("47F372736b6120446ff76b692054e6637a6f7779"); auto expected = u8"Górska Dołki Tęczowy"; - auto actual = RCT2StringToUTF8(input, RCT2LanguageId::EnglishUK); + auto actual = RCT2StringToUTF8(input, RCT2LanguageId::englishUK); ASSERT_EQ(expected, actual); } @@ -60,6 +60,6 @@ TEST_F(Localisation, RCT2_to_UTF8_ZH_TW_PREMATURE_END) // This string can be found in BATFL.DAT, the last double byte character is missing its second byte. auto input = StringFromHex("ffa470ffabacffa8aeffbdf8ffa662ffc54bffb944ffa457ffaeb6ffb0caffb76effc2"); auto expected = u8"小型車輛在鐵道上振動搖"; - auto actual = RCT2StringToUTF8(input, RCT2LanguageId::ChineseTraditional); + auto actual = RCT2StringToUTF8(input, RCT2LanguageId::chineseTraditional); ASSERT_EQ(expected, actual); }