libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-26 12:48:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: Cache cast members by name and type

Browse Source
This commit is contained in:
Eugene Sandulenko 2022-12-03 00:23:01 +01:00
parent 97b7cb60fd
commit 21c77c7a65
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/director/cast.cpp
View File

@ -1317,6 +1317,7 @@ void Cast::loadCastInfo(Common::SeekableReadStreamEndian &stream, uint16 id) {
CastMemberInfo *ci = new CastMemberInfo();
Common::MemoryReadStreamEndian *entryStream;
CastMember *member = _loadedCast->getVal(id);
// We have here variable number of strings. Thus, instead of
// adding tons of ifs, we use this switch()
@ -1365,8 +1366,14 @@ void Cast::loadCastInfo(Common::SeekableReadStreamEndian &stream, uint16 id) {
// Multiple casts can have the same name. In director only the first one is used.
if (!_castsNames.contains(ci->name)) {
_castsNames[ci->name] = id;
}
// Store name with type
Common::String cname = Common::String::format("%s:%d", ci->name.c_str(), member->_type);
if (!_castsNames.contains(cname)) {
_castsNames[cname] = id;
} else {
debugC(4, kDebugLoading, "Cast::loadCastInfo(): duplicate cast name: %s for castIDs: %s %s", ci->name.c_str(), numToCastNum(id), numToCastNum(_castsNames[ci->name]));
debugC(4, kDebugLoading, "Cast::loadCastInfo(): duplicate cast name: %s for castIDs: %s %s", cname.c_str(), numToCastNum(id), numToCastNum(_castsNames[ci->name]));
}
}
// fallthrough
@ -1377,7 +1384,6 @@ void Cast::loadCastInfo(Common::SeekableReadStreamEndian &stream, uint16 id) {
break;
}
CastMember *member = _loadedCast->getVal(id);
// For D4+ we may force Lingo scripts
if (_version < kFileVer400 || debugChannelSet(-1, kDebugNoBytecode)) {
if (!ci->script.empty()) {