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

Commit patch #1869749 "KYRA: HoF Towns Audio fix".

Browse Source 
svn-id: r30438
This commit is contained in:
Johannes Schickel 2008-01-12 08:04:00 +00:00
parent afd8743465
commit 4f8cf19292
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
engines/kyra/sound.cpp
View File

@ -469,20 +469,32 @@ void KyraEngine::snd_playWanderScoreViaMap(int command, int restart) {
// XXX
//}
assert(command*2+1 < _trackMapSize);
if (_curMusicTheme != _trackMap[command*2]) {
if (_trackMap[command*2] != -1 && _trackMap[command*2] != -2)
snd_playTheme(_trackMap[command*2]);
}
if (command != 1) {
if (_lastMusicCommand != command) {
_sound->haltTrack();
_sound->playTrack(_trackMap[command*2+1]);
if (_flags.platform == Common::kPlatformPC) {
assert(command*2+1 < _trackMapSize);
if (_curMusicTheme != _trackMap[command*2]) {
if (_trackMap[command*2] != -1 && _trackMap[command*2] != -2)
snd_playTheme(_trackMap[command*2]);
}
} else {
_sound->beginFadeOut();
}
if (command != 1) {
if (_lastMusicCommand != command) {
_sound->haltTrack();
_sound->playTrack(_trackMap[command*2+1]);
}
} else {
_sound->beginFadeOut();
}
} else if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98) {
if (command == -1) {
_sound->haltTrack();
} else {
assert(command*2+1 < _trackMapSize);
if (_trackMap[command*2] != -2 && command != _lastMusicCommand) {
_sound->haltTrack();
_sound->playTrack(command);
}
}
}
_lastMusicCommand = command;
}