diff options
| author | Travis Howell | 2005-05-08 05:56:09 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-05-08 05:56:09 +0000 |
| commit | 21717273b4064717275bce4b91ea27de744c381f (patch) | |
| tree | e3142361998ca8e1accf14d6f76f296029fbf5d8 /simon/sound.cpp | |
| parent | 169c85a19b619e85a02c9009f241a30e8c9e0f8f (diff) | |
| download | scummvm-rg350-21717273b4064717275bce4b91ea27de744c381f.tar.gz scummvm-rg350-21717273b4064717275bce4b91ea27de744c381f.tar.bz2 scummvm-rg350-21717273b4064717275bce4b91ea27de744c381f.zip | |
No need to check for speech file in non-talkie versions.
svn-id: r17952
Diffstat (limited to 'simon/sound.cpp')
| -rw-r--r-- | simon/sound.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/simon/sound.cpp b/simon/sound.cpp index 5c02510700..344ff7e472 100644 --- a/simon/sound.cpp +++ b/simon/sound.cpp @@ -245,13 +245,11 @@ Sound::Sound(const byte game, const GameSpecificSettings *gss, SoundMixer *mixer _voice_file = false; _ambient_playing = 0; - if (_game == GAME_SIMON1CD32) { - // Uses separate voice files + // simon1cd32 uses separate speech files + if (!(_game & GF_TALKIE) || (_game == GAME_SIMON1CD32)) return; - } File *file = new File(); - const char *s; #ifdef USE_FLAC if (!_voice && gss->flac_filename && gss->flac_filename[0]) { |