mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-12 18:42:36 +01:00
Code Issues Releases Wiki Activity

Rename members of RCT2LanguageId

Browse Source
This commit is contained in:
Gymnasiast
2025-10-07 20:29:20 +02:00
parent 890b8137ba
commit 57e65f5888
9 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/Game.cpp
View File

@@ -184,7 +184,7 @@ void RCT2StringToUTF8Self(char* buffer, size_t length)
{ {
if (length > 0) if (length > 0)
{ {
auto temp = RCT2StringToUTF8(buffer, RCT2LanguageId::EnglishUK); auto temp = RCT2StringToUTF8(buffer, RCT2LanguageId::englishUK);
String::safeUtf8Copy(buffer, temp.data(), length); String::safeUtf8Copy(buffer, temp.data(), length);
} }
} }

32
src/openrct2/localisation/Language.h
View File

@@ -53,22 +53,22 @@ namespace OpenRCT2
enum class RCT2LanguageId : uint8_t enum class RCT2LanguageId : uint8_t
{ {
EnglishUK, englishUK,
EnglishUS, englishUS,
French, french,
German, german,
Spanish, spanish,
Italian, italian,
Dutch, dutch,
Swedish, swedish,
Japanese, japanese,
Korean, korean,
ChineseSimplified, chineseSimplified,
ChineseTraditional, chineseTraditional,
Undefined, undefined,
Portuguese, portuguese,
Blank = 254, blank = 254,
End = 255 end = 255
}; };
struct LanguageDescriptor struct LanguageDescriptor

4
src/openrct2/object/StringTable.cpp
View File

@@ -55,9 +55,9 @@ namespace OpenRCT2
try try
{ {
RCT2LanguageId rct2LanguageId; RCT2LanguageId rct2LanguageId;
while ((rct2LanguageId = static_cast<RCT2LanguageId>(stream->ReadValue<uint8_t>())) != RCT2LanguageId::End) while ((rct2LanguageId = static_cast<RCT2LanguageId>(stream->ReadValue<uint8_t>())) != RCT2LanguageId::end)
{ {
uint8_t languageId = (EnumValue(rct2LanguageId) <= EnumValue(RCT2LanguageId::Portuguese)) uint8_t languageId = (EnumValue(rct2LanguageId) <= EnumValue(RCT2LanguageId::portuguese))
? RCT2ToOpenRCT2LanguageId[EnumValue(rct2LanguageId)] ? RCT2ToOpenRCT2LanguageId[EnumValue(rct2LanguageId)]
: static_cast<uint8_t>(LANGUAGE_UNDEFINED); : static_cast<uint8_t>(LANGUAGE_UNDEFINED);
std::string stringAsWin1252 = stream->ReadString(); std::string stringAsWin1252 = stream->ReadString();

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

@@ -254,7 +254,7 @@ namespace OpenRCT2::RCT1
dst->ObjectiveArg3 = GetBuildTheBestRideId(); dst->ObjectiveArg3 = GetBuildTheBestRideId();
} }
std::string name = RCT2StringToUTF8(_s4.ScenarioName, RCT2LanguageId::EnglishUK); std::string name = RCT2StringToUTF8(_s4.ScenarioName, RCT2LanguageId::englishUK);
std::string details; std::string details;
// TryGetById won't set this property if the scenario is not recognised, // 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]; const auto originalString = _s4.StringTable[stringId % 1024];
auto originalStringView = std::string_view( auto originalStringView = std::string_view(
originalString, RCT12::GetRCTStringBufferLen(originalString, kUserStringMaxLength)); originalString, RCT12::GetRCTStringBufferLen(originalString, kUserStringMaxLength));
auto asUtf8 = RCT2StringToUTF8(originalStringView, RCT2LanguageId::EnglishUK); auto asUtf8 = RCT2StringToUTF8(originalStringView, RCT2LanguageId::englishUK);
auto justText = RCT12RemoveFormattingUTF8(asUtf8); auto justText = RCT12RemoveFormattingUTF8(asUtf8);
return justText.data(); return justText.data();
} }

8
src/openrct2/rct12/CSStringConverter.cpp
View File

@@ -204,13 +204,13 @@ namespace OpenRCT2
{ {
switch (languageId) switch (languageId)
{ {
case RCT2LanguageId::Japanese: case RCT2LanguageId::japanese:
return CodePage::CP_932; return CodePage::CP_932;
case RCT2LanguageId::ChineseSimplified: case RCT2LanguageId::chineseSimplified:
return CodePage::CP_936; return CodePage::CP_936;
case RCT2LanguageId::Korean: case RCT2LanguageId::korean:
return CodePage::CP_949; return CodePage::CP_949;
case RCT2LanguageId::ChineseTraditional: case RCT2LanguageId::chineseTraditional:
return CodePage::CP_950; return CodePage::CP_950;
default: default:
return CodePage::CP_1252; return CodePage::CP_1252;

2
src/openrct2/rct12/RCT12.cpp
View File

@@ -642,7 +642,7 @@ std::string ConvertFormattedStringToOpenRCT2(std::string_view buffer)
{ {
buffer = buffer.substr(0, nullTerminator); buffer = buffer.substr(0, nullTerminator);
} }
auto asUtf8 = RCT2StringToUTF8(buffer, RCT2LanguageId::EnglishUK); auto asUtf8 = RCT2StringToUTF8(buffer, RCT2LanguageId::englishUK);
std::string result; std::string result;
CodepointView codepoints(asUtf8); CodepointView codepoints(asUtf8);

10
src/openrct2/rct2/S6Importer.cpp
View File

@@ -329,7 +329,7 @@ namespace OpenRCT2::RCT2
// Some scenarios have their scenario details in UTF-8, due to earlier bugs in OpenRCT2. // Some scenarios have their scenario details in UTF-8, due to earlier bugs in OpenRCT2.
auto loadMaybeUTF8 = [](std::string_view str) -> std::string { 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) if (_s6.Header.Type == S6_TYPE_SCENARIO)
@@ -617,9 +617,9 @@ namespace OpenRCT2::RCT2
void ConvertScenarioStringsToUTF8(GameState_t& gameState) void ConvertScenarioStringsToUTF8(GameState_t& gameState)
{ {
// Scenario details // Scenario details
gameState.scenarioCompletedBy = RCT2StringToUTF8(gameState.scenarioCompletedBy, RCT2LanguageId::EnglishUK); gameState.scenarioCompletedBy = RCT2StringToUTF8(gameState.scenarioCompletedBy, RCT2LanguageId::englishUK);
gameState.scenarioOptions.name = RCT2StringToUTF8(gameState.scenarioOptions.name, RCT2LanguageId::EnglishUK); gameState.scenarioOptions.name = RCT2StringToUTF8(gameState.scenarioOptions.name, RCT2LanguageId::englishUK);
gameState.scenarioOptions.details = RCT2StringToUTF8(gameState.scenarioOptions.details, RCT2LanguageId::EnglishUK); gameState.scenarioOptions.details = RCT2StringToUTF8(gameState.scenarioOptions.details, RCT2LanguageId::englishUK);
} }
void ImportRides() void ImportRides()
@@ -1820,7 +1820,7 @@ namespace OpenRCT2::RCT2
const auto originalString = _s6.CustomStrings[stringId % 1024]; const auto originalString = _s6.CustomStrings[stringId % 1024];
auto originalStringView = std::string_view( auto originalStringView = std::string_view(
originalString, RCT12::GetRCTStringBufferLen(originalString, kUserStringMaxLength)); originalString, RCT12::GetRCTStringBufferLen(originalString, kUserStringMaxLength));
auto asUtf8 = RCT2StringToUTF8(originalStringView, RCT2LanguageId::EnglishUK); auto asUtf8 = RCT2StringToUTF8(originalStringView, RCT2LanguageId::englishUK);
auto justText = RCT12RemoveFormattingUTF8(asUtf8); auto justText = RCT12RemoveFormattingUTF8(asUtf8);
return justText.data(); return justText.data();
} }

4
src/openrct2/scenario/ScenarioRepository.cpp
View File

@@ -621,7 +621,7 @@ private:
// Check if legacy highscore is better // Check if legacy highscore is better
if (scBasic.CompanyValue > highscore->company_value) 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->name = name;
highscore->company_value = scBasic.CompanyValue; highscore->company_value = scBasic.CompanyValue;
highscore->timestamp = kDatetime64Min; highscore->timestamp = kDatetime64Min;
@@ -633,7 +633,7 @@ private:
{ {
ScenarioHighscoreEntry* highscore = InsertHighscore(); ScenarioHighscoreEntry* highscore = InsertHighscore();
highscore->fileName = scBasic.Path; highscore->fileName = scBasic.Path;
std::string name = RCT2StringToUTF8(scBasic.CompletedBy, RCT2LanguageId::EnglishUK); std::string name = RCT2StringToUTF8(scBasic.CompletedBy, RCT2LanguageId::englishUK);
highscore->name = name; highscore->name = name;
highscore->company_value = scBasic.CompanyValue; highscore->company_value = scBasic.CompanyValue;
highscore->timestamp = kDatetime64Min; highscore->timestamp = kDatetime64Min;

10
test/tests/LocalisationTest.cpp
View File

@@ -27,7 +27,7 @@ TEST_F(Localisation, RCT2_to_UTF8_UK)
{ {
auto input = "The quick brown fox"; auto input = "The quick brown fox";
auto expected = u8"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); ASSERT_EQ(expected, actual);
} }
@@ -35,7 +35,7 @@ TEST_F(Localisation, RCT2_to_UTF8_JP)
{ {
auto input = StringFromHex("ff8374ff8340ff8358ff8367ff8375ff8389ff8345ff8393ff8374ff8348ff8362ff834eff8358"); auto input = StringFromHex("ff8374ff8340ff8358ff8367ff8375ff8389ff8345ff8393ff8374ff8348ff8362ff834eff8358");
auto expected = u8"ファストブラウンフォックス"; auto expected = u8"ファストブラウンフォックス";
auto actual = RCT2StringToUTF8(input, RCT2LanguageId::Japanese); auto actual = RCT2StringToUTF8(input, RCT2LanguageId::japanese);
ASSERT_EQ(expected, actual); ASSERT_EQ(expected, actual);
} }
@@ -43,7 +43,7 @@ TEST_F(Localisation, RCT2_to_UTF8_ZH_TW)
{ {
auto input = StringFromHex("ffa7d6ffb374ffaabaffb4c4ffa6e2ffaab0ffaf57"); auto input = StringFromHex("ffa7d6ffb374ffaabaffb4c4ffa6e2ffaab0ffaf57");
auto expected = u8"快速的棕色狐狸"; auto expected = u8"快速的棕色狐狸";
auto actual = RCT2StringToUTF8(input, RCT2LanguageId::ChineseTraditional); auto actual = RCT2StringToUTF8(input, RCT2LanguageId::chineseTraditional);
ASSERT_EQ(expected, actual); ASSERT_EQ(expected, actual);
} }
@@ -51,7 +51,7 @@ TEST_F(Localisation, RCT2_to_UTF8_PL)
{ {
auto input = StringFromHex("47F372736b6120446ff76b692054e6637a6f7779"); auto input = StringFromHex("47F372736b6120446ff76b692054e6637a6f7779");
auto expected = u8"Górska Dołki Tęczowy"; 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); 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. // This string can be found in BATFL.DAT, the last double byte character is missing its second byte.
auto input = StringFromHex("ffa470ffabacffa8aeffbdf8ffa662ffc54bffb944ffa457ffaeb6ffb0caffb76effc2"); auto input = StringFromHex("ffa470ffabacffa8aeffbdf8ffa662ffc54bffb944ffa457ffaeb6ffb0caffb76effc2");
auto expected = u8"小型車輛在鐵道上振動搖"; auto expected = u8"小型車輛在鐵道上振動搖";
auto actual = RCT2StringToUTF8(input, RCT2LanguageId::ChineseTraditional); auto actual = RCT2StringToUTF8(input, RCT2LanguageId::chineseTraditional);
ASSERT_EQ(expected, actual); ASSERT_EQ(expected, actual);
} }