libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 11:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

KYRA: (HOF) - fix bug no. 6285 ("Faun disappears/reappears at the end of the intro")

Browse Source
This commit is contained in:
athrxx 2021-08-09 00:30:00 +02:00
parent 6e5d7c2395
commit 3b79d6b28b
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/kyra/sequence/sequences_hof.cpp
View File

@ -986,15 +986,11 @@ void SeqPlayer_HOF::playAnimation(WSAMovie_v2 *wsaObj, int startFrame, int lastF
if (wsaObj || callback)
_screen->copyPage(12, 2);
int frameIndex = _animCurrentFrame;
if (wsaObj)
frameIndex %= wsaObj->frames();
if (callback)
(this->*callback)(wsaObj, x, y, frameIndex);
(this->*callback)(wsaObj, x, y, wsaObj ? _animCurrentFrame % wsaObj->frames() : _animCurrentFrame);
if (wsaObj)
wsaObj->displayFrame(frameIndex, 2, x, y, 0, 0, 0);
wsaObj->displayFrame(_animCurrentFrame % wsaObj->frames(), 2, x, y, 0, 0, 0);
_screen->copyPage(2, 12);
@ -1095,7 +1091,7 @@ void SeqPlayer_HOF::playDialogueAnimation(uint16 strID, uint16 soundID, int text
if (ABS(animLastFrame) < curframe)
curframe = ABS(animLastFrame);
if (curframe == animStartFrame)
if (curframe == animStartFrame && animStartFrame < animLastFrame)
curframe++;
_animCurrentFrame = curframe;
@ -1297,7 +1293,7 @@ void SeqPlayer_HOF::playSoundEffect(uint16 id, int16 vol) {
void SeqPlayer_HOF::playSoundAndDisplaySubTitle(uint16 id) {
assert(id < _sequenceSoundListSize);
if (id < 12 && !_vm->gameFlags().isDemo && _vm->textEnabled())
if (id < 12 && !(_vm->gameFlags().isDemo && !_vm->gameFlags().isTalkie) && _vm->textEnabled())
displaySubTitle(id, 160, 168, _textDuration[id], 160);
_vm->sound()->voicePlay(_sequenceSoundList[id], 0);