diff options
author | Willem Jan Palenstijn | 2015-07-22 22:37:40 +0200 |
---|---|---|
committer | Willem Jan Palenstijn | 2015-07-22 22:43:42 +0200 |
commit | 6ec9c81b575f13b2c4b30aeac592ebf2557b5890 (patch) | |
tree | 503d50902bad2d800165593039d08d5ccf0c98ab /engines/saga/saga.cpp | |
parent | 5ec05f6b647c5ea41418be7ed19ad381f97cabd8 (diff) | |
parent | 4e5c8d35f7e133e2e72a846fdbd54900c91eeb73 (diff) | |
download | scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.gz scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.bz2 scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.zip |
Merge branch 'master' into mm
Conflicts:
engines/access/access.cpp
engines/access/asurface.h
engines/access/bubble_box.cpp
engines/access/bubble_box.h
engines/access/martian/martian_game.cpp
engines/access/player.cpp
engines/access/player.h
engines/access/resources.cpp
engines/access/screen.cpp
engines/access/screen.h
engines/access/sound.cpp
engines/access/sound.h
Diffstat (limited to 'engines/saga/saga.cpp')
-rw-r--r-- | engines/saga/saga.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp index 3d38b3ea52..b94bb66bb4 100644 --- a/engines/saga/saga.cpp +++ b/engines/saga/saga.cpp @@ -117,6 +117,9 @@ SagaEngine::SagaEngine(OSystem *syst, const SAGAGameDescription *gameDesc) SearchMan.addSubDirectoryMatching(gameDataDir, "music"); SearchMan.addSubDirectoryMatching(gameDataDir, "sound"); + // Location of Miles audio files (sample.ad and sample.opl) in IHNM + SearchMan.addSubDirectoryMatching(gameDataDir, "drivers"); + // The Multi-OS version puts the voices file in the root directory of // the CD. The rest of the data files are in game/itedata SearchMan.addSubDirectoryMatching(gameDataDir, "game/itedata"); @@ -634,6 +637,9 @@ void SagaEngine::syncSoundSettings() { } void SagaEngine::pauseEngineIntern(bool pause) { + if (!_render || !_music) + return; + bool engineIsPaused = (_render->getFlags() & RF_RENDERPAUSE); if (engineIsPaused == pause) return; |