[Scummvm-cvs-logs] scummvm master -> b05187c1a70adc835c4ae11bed59a835670765b0
Kirben
kirben at optusnet.com.au
Thu Nov 3 03:02:46 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b05187c1a7 AGOS: Merge duplicate code remaining from refactoring in the past.
Commit: b05187c1a70adc835c4ae11bed59a835670765b0
https://github.com/scummvm/scummvm/commit/b05187c1a70adc835c4ae11bed59a835670765b0
Author: Travis Howell (kirben at optusnet.com.au)
Date: 2011-11-02T19:02:12-07:00
Commit Message:
AGOS: Merge duplicate code remaining from refactoring in the past.
Changed paths:
engines/agos/sound.cpp
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp
index dd3cc74..4917aef 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);
}
More information about the Scummvm-git-logs
mailing list