mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 23:04:36 +01:00
Code Issues Releases Wiki Activity

Close #13626: Refactor RCT2LanguageId to strong enum

Browse Source
This commit is contained in:
Tulio Leao
2020-12-23 01:43:27 -03:00
parent 00483df2f2
commit af0ec60bed
8 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,10 +53,11 @@ void StringTable::Read(IReadObjectContext* context, OpenRCT2::IStream* stream, O
try
{
RCT2LanguageId rct2LanguageId;
while ((rct2LanguageId = static_cast<RCT2LanguageId>(stream->ReadValue<uint8_t>())) != RCT2_LANGUAGE_ID_END)
while ((rct2LanguageId = static_cast<RCT2LanguageId>(stream->ReadValue<uint8_t>())) != RCT2LanguageId::End)
{
uint8_t languageId = (rct2LanguageId <= RCT2_LANGUAGE_ID_PORTUGUESE) ? RCT2ToOpenRCT2LanguageId[rct2LanguageId]
: static_cast<uint8_t>(LANGUAGE_UNDEFINED);
uint8_t languageId = (EnumValue(rct2LanguageId) <= EnumValue(RCT2LanguageId::Portuguese))
? RCT2ToOpenRCT2LanguageId[EnumValue(rct2LanguageId)]
: static_cast<uint8_t>(LANGUAGE_UNDEFINED);
std::string stringAsWin1252 = stream->ReadStdString();
auto stringAsUtf8 = rct2_to_utf8(stringAsWin1252, rct2LanguageId);