libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 06:08:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: Fix implementation of converting references to strings

Browse Source
This commit is contained in:
Eugene Sandulenko 2019-12-22 14:49:43 +01:00
parent 8895ca3c1f
commit 8e6304bd13
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/director/lingo/lingo.cpp
View File

@ -615,7 +615,21 @@ Common::String *Datum::toString() {
*s = Common::String::format("var: #%s", u.sym->name.c_str());
break;
case REFERENCE:
*s = Common::String::format("field#%d", u.i);
{
int idx = u.i;
if (!g_director->getCurrentScore()->_loadedText->contains(idx)) {
if (!g_director->getCurrentScore()->_loadedText->contains(idx - 1024)) {
warning("toString(): Unknown REFERENCE %d", idx);
*s = "";
break;
} else {
idx -= 1024;
}
}
*s = g_director->getCurrentScore()->_loadedText->getVal(idx)->_ptext;
}
break;
default:
warning("Incorrect operation toString() for type: %s", type2str());