diff options
| author | Ori Avtalion | 2016-05-21 13:55:38 +0300 |
|---|---|---|
| committer | Ori Avtalion | 2016-05-21 13:55:38 +0300 |
| commit | 3ad6af92f20b98b3c7a5045fe8e55045cff9caf1 (patch) | |
| tree | 5c9d1d47dbeff6a9ec20d84c925da19b199c917c /engines/scumm/string.cpp | |
| parent | 10cbeb1ac6be299c06297c0f2c69e7cc8a5cb7cc (diff) | |
| download | scummvm-rg350-3ad6af92f20b98b3c7a5045fe8e55045cff9caf1.tar.gz scummvm-rg350-3ad6af92f20b98b3c7a5045fe8e55045cff9caf1.tar.bz2 scummvm-rg350-3ad6af92f20b98b3c7a5045fe8e55045cff9caf1.zip | |
SCUMM: Reduce audio header dependencies
Diffstat (limited to 'engines/scumm/string.cpp')
| -rw-r--r-- | engines/scumm/string.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp index 3049fbcf62..e6054918fa 100644 --- a/engines/scumm/string.cpp +++ b/engines/scumm/string.cpp @@ -23,6 +23,7 @@ #include "common/config-manager.h" +#include "audio/mixer.h" #include "scumm/actor.h" #include "scumm/charset.h" @@ -662,7 +663,7 @@ void ScummEngine::CHARSET_1() { // Special case for HE games } else if (_game.id == GID_LOOM && !ConfMan.getBool("subtitles") && (_sound->pollCD())) { // Special case for Loom (CD), since it only uses CD audio.for sound - } else if (!ConfMan.getBool("subtitles") && (!_haveActorSpeechMsg || _mixer->isSoundHandleActive(_sound->_talkChannelHandle))) { + } else if (!ConfMan.getBool("subtitles") && (!_haveActorSpeechMsg || _mixer->isSoundHandleActive(*_sound->_talkChannelHandle))) { // Subtitles are turned off, and there is a voice version // of this message -> don't print it. } else { |