diff options
| author | Thanasis Antoniou | 2019-04-10 18:59:27 +0300 |
|---|---|---|
| committer | Thanasis Antoniou | 2019-04-10 19:00:14 +0300 |
| commit | e90f70885248626c96d7643e1c9ad27d6f5f4b78 (patch) | |
| tree | 809ab34a2079f3c2b6a1f94cd570438895439814 /engines/bladerunner/audio_speech.cpp | |
| parent | c99fbcd53b10261fb193f056ba544df81bb401e3 (diff) | |
| download | scummvm-rg350-e90f70885248626c96d7643e1c9ad27d6f5f4b78.tar.gz scummvm-rg350-e90f70885248626c96d7643e1c9ad27d6f5f4b78.tar.bz2 scummvm-rg350-e90f70885248626c96d7643e1c9ad27d6f5f4b78.zip | |
BLADERUNNER: Persistent sound settings, speech samples fix
Diffstat (limited to 'engines/bladerunner/audio_speech.cpp')
| -rw-r--r-- | engines/bladerunner/audio_speech.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/engines/bladerunner/audio_speech.cpp b/engines/bladerunner/audio_speech.cpp index 2370a7b1d3..8d2f18dbb6 100644 --- a/engines/bladerunner/audio_speech.cpp +++ b/engines/bladerunner/audio_speech.cpp @@ -32,7 +32,9 @@ namespace BladeRunner { -const int AudioSpeech::kSpeechSamples[] = { 65, 355, 490, 465, 480, 485, 505, 760, 7655, 7770, 7740, 8170, 2705, 7200, 6460, 5560, 4870, 4555, 3880, 3525, 3595, 3250, 3070 }; +// Note: Speech samples here should be from A.TLK file +const int kSpeechSamplesNumber = 23; +const int AudioSpeech::kSpeechSamples[kSpeechSamplesNumber] = { 65, 355, 490, 465, 480, 485, 505, 760, 7655, 7770, 7740, 8170, 2705, 7200, 6460, 5560, 4870, 4555, 3880, 3525, 3595, 3250, 3070 }; void AudioSpeech::ended() { //Common::StackLock lock(_mutex); @@ -138,7 +140,14 @@ int AudioSpeech::getVolume() const { } void AudioSpeech::playSample() { - _vm->_playerActor->speechPlay(kSpeechSamples[_vm->_rnd.getRandomNumber(22)], true); +#if BLADERUNNER_ORIGINAL_BUGS + _vm->_playerActor->speechPlay(kSpeechSamples[_vm->_rnd.getRandomNumber(kSpeechSamplesNumber-1)], true); +#else + if (_vm->openArchive("A.TLK")) { + // load sample speech even when in initial KIA screen (upon launch - but before loading a game) + _vm->_playerActor->speechPlay(kSpeechSamples[_vm->_rnd.getRandomNumber(kSpeechSamplesNumber-1)], true); + } +#endif // BLADERUNNER_ORIGINAL_BUGS } } // End of namespace BladeRunner |