diff options
| author | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
| commit | 504cf6ecb688a3f1c65a857bffd527d8b0e6ba63 (patch) | |
| tree | 0c0d96d4061c11850c851f0fc981c75a58c20515 /engines/sword1/sound.h | |
| parent | d8c28d15ae553d047b7e571f98727fa79ee143f3 (diff) | |
| parent | e19922d181e775791f9105b8be7ff410770ede51 (diff) | |
| download | scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.gz scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.bz2 scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.zip | |
Merge branch 'master' into xeen
Diffstat (limited to 'engines/sword1/sound.h')
| -rw-r--r-- | engines/sword1/sound.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sword1/sound.h b/engines/sword1/sound.h index e65e797934..18ee91dff2 100644 --- a/engines/sword1/sound.h +++ b/engines/sword1/sound.h @@ -110,7 +110,7 @@ private: void initCowSystem(); uint32 getSampleId(int32 fxNo); - int16 *uncompressSpeech(uint32 index, uint32 cSize, uint32 *size); + int16 *uncompressSpeech(uint32 index, uint32 cSize, uint32 *size, bool* ok = 0); void calcWaveVolume(int16 *data, uint32 length); bool _waveVolume[WAVE_VOL_TAB_LENGTH]; uint16 _waveVolPos; |