From eba16c05d7952b88f7de8d39c8081f5da30cbff1 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sun, 11 Oct 2015 18:57:18 +0100 Subject: SHERLOCK: Fix compilation error on OS X The error was: no viable conversion from 'std::__1::nullptr_t' to 'const Common::String' --- engines/sherlock/sound.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines') 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 -- cgit v1.2.3