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

Fix #13549: Ride name is truncated/resetted in Korean

Browse Source 
Handle multi-byte RCT2 strings when converting to string_view.
This commit is contained in:
Ted John
2020-12-23 19:19:25 +00:00
committed by GitHub
parent 5dd0ff12c4
commit 9809df8de6
4 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3004,7 +3004,8 @@ private:
std::string GetUserString(rct_string_id stringId)
{
const auto originalString = _s4.string_table[(stringId - USER_STRING_START) % 1024];
auto originalStringView = String::ToStringView(originalString, USER_STRING_MAX_LENGTH);
auto originalStringView = std::string_view(
originalString, GetRCT2StringBufferLen(originalString, USER_STRING_MAX_LENGTH));
auto asUtf8 = rct2_to_utf8(originalStringView, RCT2_LANGUAGE_ID_ENGLISH_UK);
auto justText = RCT12RemoveFormattingUTF8(asUtf8);
return justText.data();

29
src/openrct2/rct2/RCT2.cpp
View File

@@ -84,6 +84,35 @@ uint8_t OpenRCT2RideTypeToRCT2RideType(ObjectEntryIndex openrct2Type)
}
}
size_t GetRCT2StringBufferLen(const char* buffer, size_t maxBufferLen)
{
constexpr char MULTIBYTE = static_cast<char>(255);
size_t len = 0;
for (size_t i = 0; i < maxBufferLen; i++)
{
auto ch = buffer[i];
if (ch == MULTIBYTE)
{
i += 2;
// Check if reading two more bytes exceeds max buffer len
if (i < maxBufferLen)
{
len += 3;
}
}
else if (ch == '\0')
{
break;
}
else
{
len++;
}
}
return len;
}
uint8_t rct2_ride::GetMinCarsPerTrain() const
{
return min_max_cars_per_train >> 4;

6
src/openrct2/rct2/RCT2.h
View File

@@ -779,3 +779,9 @@ std::vector<uint8_t> DecryptSea(const fs::path& path);
ObjectEntryIndex RCT2RideTypeToOpenRCT2RideType(uint8_t rct2RideType, const rct_ride_entry* rideEntry);
bool RCT2RideTypeNeedsConversion(uint8_t rct2RideType);
uint8_t OpenRCT2RideTypeToRCT2RideType(ObjectEntryIndex openrct2Type);
/**
* Iterates an RCT2 string buffer and returns the length of the string in bytes.
* Handles single and multi-byte strings.
*/
size_t GetRCT2StringBufferLen(const char* buffer, size_t maxBufferLen);

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

@@ -1658,7 +1658,8 @@ public:
std::string GetUserString(rct_string_id stringId)
{
const auto originalString = _s6.custom_strings[(stringId - USER_STRING_START) % 1024];
auto originalStringView = String::ToStringView(originalString, USER_STRING_MAX_LENGTH);
auto originalStringView = std::string_view(
originalString, GetRCT2StringBufferLen(originalString, USER_STRING_MAX_LENGTH));
auto asUtf8 = rct2_to_utf8(originalStringView, RCT2_LANGUAGE_ID_ENGLISH_UK);
auto justText = RCT12RemoveFormattingUTF8(asUtf8);
return justText.data();