diff options
| author | Travis Howell | 2006-09-29 00:50:22 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-09-29 00:50:22 +0000 |
| commit | 11c9537e290fbab5d604037609fb40c70149b283 (patch) | |
| tree | 40fd9654e690a2e690ca786f8a407224ca7a706a /engines/simon/sound.cpp | |
| parent | 1c6cd9d2498e7d905aed1930ad2cde006a4b1f20 (diff) | |
| download | scummvm-rg350-11c9537e290fbab5d604037609fb40c70149b283.tar.gz scummvm-rg350-11c9537e290fbab5d604037609fb40c70149b283.tar.bz2 scummvm-rg350-11c9537e290fbab5d604037609fb40c70149b283.zip | |
Add speech support for PP and cleanup
svn-id: r23995
Diffstat (limited to 'engines/simon/sound.cpp')
| -rw-r--r-- | engines/simon/sound.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/engines/simon/sound.cpp b/engines/simon/sound.cpp index 894bbce2e0..36766da685 100644 --- a/engines/simon/sound.cpp +++ b/engines/simon/sound.cpp @@ -288,8 +288,7 @@ Sound::~Sound() { void Sound::loadVoiceFile(const GameSpecificSettings *gss) { // Game versions which use separate voice files - if (_vm->getGameType() == GType_FF || _vm->getGameType() == GType_PP || - _vm->getGameId() == GID_SIMON1CD32) + if (_vm->getGameType() == GType_FF || _vm->getGameId() == GID_SIMON1CD32) return; char filename[16]; @@ -361,7 +360,10 @@ void Sound::loadVoiceFile(const GameSpecificSettings *gss) { file->open(filename); if (file->isOpen()) { _hasVoiceFile = true; - _voice = new VocSound(_mixer, file); + if (_vm->getGameType() == GType_PP) + _voice = new WavSound(_mixer, file); + else + _voice = new VocSound(_mixer, file); } } } @@ -482,7 +484,8 @@ void Sound::playVoice(uint sound) { return; _mixer->stopHandle(_voiceHandle); - if (_vm->getGameType() == GType_FF || _vm->getGameId() == GID_SIMON1CD32) { + if (_vm->getGameType() == GType_FF || _vm->getGameType() == GType_PP || + _vm->getGameId() == GID_SIMON1CD32) { _voice->playSound(sound, &_voiceHandle, 0); } else { _voice->playSound(sound, &_voiceHandle, Audio::Mixer::FLAG_UNSIGNED); |