diff options
| author | Max Horn | 2003-12-26 13:13:56 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-26 13:13:56 +0000 |
| commit | aa26fa0681ebd871ff976e6aec4d112eb9b21a19 (patch) | |
| tree | 30831b970e42cb2784265cd4086f1f19f7aebf84 /scumm/sound.cpp | |
| parent | ffbfe8922a3cfa2d2750fca3a2cb2d953fd1e4ca (diff) | |
| download | scummvm-rg350-aa26fa0681ebd871ff976e6aec4d112eb9b21a19.tar.gz scummvm-rg350-aa26fa0681ebd871ff976e6aec4d112eb9b21a19.tar.bz2 scummvm-rg350-aa26fa0681ebd871ff976e6aec4d112eb9b21a19.zip | |
when introducing a constant used throughout multiple files, best assign a *name* to it, else you're digging your own grave on the long run :-)
svn-id: r11941
Diffstat (limited to 'scumm/sound.cpp')
| -rw-r--r-- | scumm/sound.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 5523635069..b4c601de53 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -407,7 +407,7 @@ void Sound::processSfxQueues() { act = _scumm->VAR(_scumm->VAR_TALK_ACTOR); if (_scumm->_imuseDigital) { - finished = !isSoundRunning(10000); + finished = !isSoundRunning(kTalkSoundID); } else { finished = !_talkChannelHandle.isActive(); } @@ -565,7 +565,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, PlayingSoundHandle void Sound::stopTalkSound() { if (_sfxMode & 2) { if (_scumm->_imuseDigital) { - _scumm->_imuseDigital->stopSound(10000); + _scumm->_imuseDigital->stopSound(kTalkSoundID); } else { _scumm->_mixer->stopHandle(_talkChannelHandle); } @@ -822,7 +822,7 @@ void Sound::startSfxSound(File *file, int file_size, PlayingSoundHandle *handle, if (_scumm->_imuseDigital) { _scumm->_imuseDigital->setVocVoice(data, size, rate); - _scumm->_imuseDigital->startSound(10000); + _scumm->_imuseDigital->startSound(kTalkSoundID); free(data); } else { _scumm->_mixer->playRaw(handle, data, size, rate, SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_UNSIGNED, id); |