aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/sound
diff options
context:
space:
mode:
authorathrxx2020-01-03 01:58:29 +0100
committerathrxx2020-01-03 13:04:11 +0100
commit1403f9ffa235ddbdbee10efa04cc4081c0cfcd7c (patch)
tree30d5d0fe3e446a173657093951a563b36d23dd20 /engines/kyra/sound
parent48b834bd5e4ff5d5f992a19373b4986f44aa9ccd (diff)
downloadscummvm-rg350-1403f9ffa235ddbdbee10efa04cc4081c0cfcd7c.tar.gz
scummvm-rg350-1403f9ffa235ddbdbee10efa04cc4081c0cfcd7c.tar.bz2
scummvm-rg350-1403f9ffa235ddbdbee10efa04cc4081c0cfcd7c.zip
KYRA: minor AdLib driver fix
This commit extends a fix that was previously limited to the EOB games. It seems that the later games can also have situations where this becomes necessary (e. g. I noticed that the HOF title music went missing when aborting the intro via left click).
Diffstat (limited to 'engines/kyra/sound')
-rw-r--r--engines/kyra/sound/drivers/adlib.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/kyra/sound/drivers/adlib.cpp b/engines/kyra/sound/drivers/adlib.cpp
index de6b8a461a..4f4ae14047 100644
--- a/engines/kyra/sound/drivers/adlib.cpp
+++ b/engines/kyra/sound/drivers/adlib.cpp
@@ -245,8 +245,9 @@ void AdLibDriver::setupPrograms() {
// next sound (with a lower priority) starts which will cause that sound to be skipped. We simply
// restart incoming sounds during stop sound execution.
// UPDATE: This stilly applies after introduction of the _programQueue.
+ // UPDATE: This can also happen with the HOF main menu, so I commented out the version < 3 limitation.
QueueEntry retrySound;
- if (_version < 3 && _programQueue[_programQueueStart].id == 0)
+ if (/*_version < 3 &&*/ _programQueue[_programQueueStart].id == 0)
_retrySounds = true;
else if (_retrySounds)
retrySound = _programQueue[_programQueueStart];