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

DIRECTOR: Fix palette loading for D2

Browse Source 
PaletteCastMembers exist in D2, and the process for loading them is
the same as in D3. The special case in Cast::loadCast() isn't needed.

In D2 the PaletteCastMember::load() hook wasn't getting called;
we solve this by copying the load() hook to loadCastDataVWCR, which will
get called even if there are no CastInfo objects.

Fixes the colour-cycling Invictus logo in Alice: An Interactive Museum.
This commit is contained in:
Scott Percival 2023-07-18 18:31:47 +08:00 committed by Eugene Sandulenko
parent 9717100508
commit dff38babeb
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engines/director/cast.cpp
View File

@ -475,19 +475,6 @@ bool Cast::loadConfig() {
}
void Cast::loadCast() {
// Palette Information for D2; D3 and higher call this from the cast
if (_version < kFileVer300) {
Common::Array<uint16> clutList = _castArchive->getResourceIDList(MKTAG('C', 'L', 'U', 'T'));
for (uint i = 0; i < clutList.size(); i++) {
Common::SeekableReadStreamEndian *pal = _castArchive->getResource(MKTAG('C', 'L', 'U', 'T'), clutList[i]);
debugC(2, kDebugLoading, "****** Loading Palette CLUT, #%d", clutList[i]);
PaletteV4 palData = loadPalette(*pal, clutList[i]);
CastMemberID cid(clutList[i], DEFAULT_CAST_LIB);
g_director->addPalette(cid, palData.palette, palData.length);
delete pal;
}
}
Common::SeekableReadStreamEndian *r = nullptr;
// Font Directory
@ -797,6 +784,8 @@ void Cast::loadCastDataVWCR(Common::SeekableReadStreamEndian &stream) {
case kCastPalette:
debugC(3, kDebugLoading, "Cast::loadCastDataVWCR(): CastTypes id: %d(%s) PaletteCastMember", id, numToCastNum(id));
_loadedCast->setVal(id, new PaletteCastMember(this, id, stream, _version));
// load the palette now, as there are no CastInfo structs
_loadedCast->getVal(id)->load();
break;
case kCastFilmLoop:
debugC(3, kDebugLoading, "Cast::loadCastDataVWCR(): CastTypes id: %d(%s) FilmLoopCastMember", id, numToCastNum(id));