diff options
author | Bastien Bouclet | 2016-08-08 07:35:55 +0200 |
---|---|---|
committer | Bastien Bouclet | 2016-08-11 19:53:20 +0200 |
commit | 2756d6226b1567dbe650284c56d93d722af906b2 (patch) | |
tree | c08237d5dd570950dff2e087d6f592183570848a /engines/mohawk/riven.cpp | |
parent | aeee4888beb8ba15a32a438e4ac82c53d250e039 (diff) | |
download | scummvm-rg350-2756d6226b1567dbe650284c56d93d722af906b2.tar.gz scummvm-rg350-2756d6226b1567dbe650284c56d93d722af906b2.tar.bz2 scummvm-rg350-2756d6226b1567dbe650284c56d93d722af906b2.zip |
MOHAWK: Add a Riven specific sound manager
- Add ambient sound fading
- Fix ambient sound volume to use the list-level volume
Diffstat (limited to 'engines/mohawk/riven.cpp')
-rw-r--r-- | engines/mohawk/riven.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp index 054b6ca6bc..b7c83c0ff8 100644 --- a/engines/mohawk/riven.cpp +++ b/engines/mohawk/riven.cpp @@ -34,8 +34,8 @@ #include "mohawk/riven_external.h" #include "mohawk/riven_graphics.h" #include "mohawk/riven_saveload.h" +#include "mohawk/riven_sound.h" #include "mohawk/dialogs.h" -#include "mohawk/sound.h" #include "mohawk/video.h" #include "mohawk/console.h" @@ -125,7 +125,7 @@ Common::Error MohawkEngine_Riven::run() { SearchMan.add("arcriven.z", &_installerArchive, 0, false); _gfx = new RivenGraphics(this); - _sound = new Sound(this); + _sound = new RivenSoundManager(this); _console = new RivenConsole(this); _saveLoad = new RivenSaveLoad(this, _saveFileMan); _externalScriptHandler = new RivenExternal(this); @@ -202,6 +202,7 @@ Common::Error MohawkEngine_Riven::run() { void MohawkEngine_Riven::handleEvents() { // Update background running things checkTimer(); + _sound->updateSLST(); bool needsUpdate = _gfx->runScheduledWaterEffects(); needsUpdate |= _video->updateMovies(); @@ -713,6 +714,7 @@ void MohawkEngine_Riven::delayAndUpdate(uint32 ms) { uint32 startTime = _system->getMillis(); while (_system->getMillis() < startTime + ms && !shouldQuit()) { + _sound->updateSLST(); bool needsUpdate = _gfx->runScheduledWaterEffects(); needsUpdate |= _video->updateMovies(); |