libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 21:54:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: LINGO: Re-encode Lingo constants to UTF-8

Browse Source
This commit is contained in:
djsrv 2021-07-14 02:00:00 -04:00 committed by D.J. Servilla
parent d0df2bd014
commit 5b3bed6e57
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/director/lingo/lingo-bytecode.cpp
View File

@ -1079,8 +1079,7 @@ ScriptContext *LingoCompiler::compileLingoV4(Common::SeekableReadStreamEndian &s
switch (constType) {
case 1: // String type
{
constant.type = STRING;
constant.u.s = new Common::String();
Common::String str;
uint32 pointer = value;
if (pointer + 4 > constsStoreSize) {
error("Constant string is too small");
@ -1094,12 +1093,10 @@ ScriptContext *LingoCompiler::compileLingoV4(Common::SeekableReadStreamEndian &s
break;
}
while (pointer < end) {
if (constsStore[pointer] == '\r') {
*constant.u.s += '\n';
} else if (constsStore[pointer] == '\0') {
if (constsStore[pointer] == '\0') {
break;
} else {
*constant.u.s += constsStore[pointer];
str += constsStore[pointer];
}
pointer += 1;
}
@ -1107,6 +1104,9 @@ ScriptContext *LingoCompiler::compileLingoV4(Common::SeekableReadStreamEndian &s
warning("Constant string has no null terminator");
break;
}
Common::CodePage encoding = g_director->getPlatformEncoding();
constant.type = STRING;
constant.u.s = new Common::String(str.decode(encoding), Common::kUtf8);
}
break;
case 4: // Integer type