diff options
| author | Thierry Crozat | 2015-10-11 18:57:18 +0100 |
|---|---|---|
| committer | Thierry Crozat | 2015-10-11 18:57:18 +0100 |
| commit | eba16c05d7952b88f7de8d39c8081f5da30cbff1 (patch) | |
| tree | 34f39d631ddf4b722fa68d990491b1f83d9031cb /engines | |
| parent | 01aba70b04a55fe3815b4c65972e068f31812e0d (diff) | |
| download | scummvm-rg350-eba16c05d7952b88f7de8d39c8081f5da30cbff1.tar.gz scummvm-rg350-eba16c05d7952b88f7de8d39c8081f5da30cbff1.tar.bz2 scummvm-rg350-eba16c05d7952b88f7de8d39c8081f5da30cbff1.zip | |
SHERLOCK: Fix compilation error on OS X
The error was:
no viable conversion from 'std::__1::nullptr_t' to 'const Common::String'
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sherlock/sound.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp index 36ca67b323..56ac2a5d9a 100644 --- a/engines/sherlock/sound.cpp +++ b/engines/sherlock/sound.cpp @@ -251,7 +251,7 @@ void Sound::playSpeech(const Common::String &name) { if (IS_SERRATED_SCALPEL) { Common::String filename = formFilename(name); - if (playSoundResource(filename, nullptr, Audio::Mixer::kSFXSoundType, _speechHandle)) + if (playSoundResource(filename, Common::String(), Audio::Mixer::kSFXSoundType, _speechHandle)) _speechPlaying = true; } else { // Figure out which speech library to use |