aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2011-11-03 13:02:12 +1100
committerTravis Howell2011-11-03 13:02:12 +1100
commitb05187c1a70adc835c4ae11bed59a835670765b0 (patch)
tree7c5a55f6c9ded8009608a505ee91a37c69c944a6
parent0f711c4a2e6d03d481cbb7d396e3e494b2351b38 (diff)
downloadscummvm-rg350-b05187c1a70adc835c4ae11bed59a835670765b0.tar.gz
scummvm-rg350-b05187c1a70adc835c4ae11bed59a835670765b0.tar.bz2
scummvm-rg350-b05187c1a70adc835c4ae11bed59a835670765b0.zip
AGOS: Merge duplicate code remaining from refactoring in the past.
-rw-r--r--engines/agos/sound.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp
index dd3cc74367..4917aefa4d 100644
--- a/engines/agos/sound.cpp
+++ b/engines/agos/sound.cpp
@@ -606,8 +606,6 @@ void Sound::playVoice(uint sound) {
_voice->playSound(sound, sound + 1, Audio::Mixer::kMusicSoundType, &_voiceHandle, true, -1500);
else
_voice->playSound(sound, sound, Audio::Mixer::kMusicSoundType, &_voiceHandle, true);
- } else if (_vm->getGameType() == GType_FF || _vm->getGameId() == GID_SIMON1CD32) {
- _voice->playSound(sound, Audio::Mixer::kSpeechSoundType, &_voiceHandle, false);
} else {
_voice->playSound(sound, Audio::Mixer::kSpeechSoundType, &_voiceHandle, false);
}