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

KYRA: (LoK/Mac) - fix music track map

Browse Source 
Looks like an original bug to me. It would miss the track when Malcolm appears after first entering the castle.
This commit is contained in:
athrxx 2021-11-10 17:55:02 +01:00
parent 0f152344e1
commit c86b2bf3f4
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/kyra/resource/staticres.cpp
View File

@ -1295,7 +1295,7 @@ const int8 KyraEngine_LoK::_macHQTrackMap[] = {
23, 40, 38, 35, 28, 21, 41, 15,
3, 15, 43, 25, 33, 21, 30, 22,
15, 3, 33, 11, 12, 13, 14, 36,
36, 36, 3, 3, 44, 3, 3, 45,
36, 36, 3, 3, 3, 44, 3, 45,
3, 3, 3, 3, 3, 3, 33, 0
};
@ -1307,9 +1307,8 @@ const int8 KyraEngine_LoK::_macLQTrackMap[] = {
23, 26, 26, 30, 28, 21, 21, 15,
3, 15, 23, 25, 33, 21, 30, 22,
15, 3, 33, 11, 12, 13, 14, 22,
22, 22, 3, 3, 23, 3, 3, 23,
3, 3, 3, 3, 3, 3, 33, 0,
0, 1, 39, 26, 31, 30, 33, 33
22, 22, 3, 3, 3, 23, 3, 23,
3, 3, 3, 3, 3, 3, 33, 0
};
const int KyraEngine_LoK::_macLQTrackMapSize = ARRAYSIZE(KyraEngine_LoK::_macLQTrackMap);

2
engines/kyra/sound/sound_mac_lok.cpp
View File

@ -214,7 +214,7 @@ void SoundMac::playSoundEffect(uint16 track, uint8) {
}
bool SoundMac::isPlaying() const {
return false;
return _ready && _driver->doCommand(3);
}
void SoundMac::beginFadeOut() {