diff options
| author | Max Horn | 2003-12-27 14:10:45 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-27 14:10:45 +0000 |
| commit | 0aa79932183eefdbfc512f73469ccdca4ddde0fe (patch) | |
| tree | 376630f6128553683cf05fe87c2314fdde3fc530 /scumm | |
| parent | d0ceed85a5f74b10d29f1295dd5642fdef4c5a3f (diff) | |
| download | scummvm-rg350-0aa79932183eefdbfc512f73469ccdca4ddde0fe.tar.gz scummvm-rg350-0aa79932183eefdbfc512f73469ccdca4ddde0fe.tar.bz2 scummvm-rg350-0aa79932183eefdbfc512f73469ccdca4ddde0fe.zip | |
renamed VOC functions
svn-id: r11962
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/imuse_digi.cpp | 2 | ||||
| -rw-r--r-- | scumm/sound.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/imuse_digi.cpp b/scumm/imuse_digi.cpp index a56fd3628c..35863b03f8 100644 --- a/scumm/imuse_digi.cpp +++ b/scumm/imuse_digi.cpp @@ -836,7 +836,7 @@ void IMuseDigital::startSound(int sound) { _voiceVocData = NULL; } else if (READ_UINT32(ptr) == MKID('Crea')) { int32 loops = 0; - byte *t_ptr= readCreativeVoc(ptr, size, _channel[l].freq, loops); + byte *t_ptr= readVOCFromMemory(ptr, size, _channel[l].freq, loops); _channel[l].mixerSize = _channel[l].freq * 2; _channel[l].size = size * 2; _channel[l].bits = 8; diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 95532761e6..13fa9cb31f 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -812,7 +812,7 @@ void Sound::startSfxSound(File *file, int file_size, PlayingSoundHandle *handle, int32 size; int rate; - byte *data = loadVocSample(_sfxFile, size, rate); + byte *data = loadVOCFile(_sfxFile, size, rate); if (_scumm->_imuseDigital) { _scumm->_imuseDigital->setVocVoice(data, size, rate); |