mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-31 02:35:46 +01:00
Code Issues Releases Wiki Activity

Refactor string conversion between RCT2 and UTF8

Browse Source 
Use Win32 API for conversion on Windows for non-1252 code pages instead of built-in tables.
This commit is contained in:
Ted John
2018-04-14 18:06:49 +01:00
committed by Aaron van Geffen
parent 2512e4959c
commit deaa60f8f1
17 changed files with 343 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/Game.cpp
View File

@@ -1089,11 +1089,10 @@ static void load_landscape()
void utf8_to_rct2_self(char * buffer, size_t length)
{
char tempBuffer[512];
utf8_to_rct2(tempBuffer, buffer);
auto temp = utf8_to_rct2(buffer);
size_t i = 0;
const char * src = tempBuffer;
const char * src = temp.data();
char * dst = buffer;
while (*src != 0 && i < length - 1)
{
@@ -1129,9 +1128,8 @@ void rct2_to_utf8_self(char * buffer, size_t length)
{
if (length > 0)
{
char tempBuffer[512];
rct2_to_utf8(tempBuffer, buffer);
safe_strcpy(buffer, tempBuffer, length);
auto temp = rct2_to_utf8(buffer, RCT2_LANGUAGE_ID_ENGLISH_UK);
safe_strcpy(buffer, temp.data(), length);
}
}