diff options
| author | Max Horn | 2003-12-24 00:25:18 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-24 00:25:18 +0000 |
| commit | e9269257f3da947eca3fb167b279fbe91650157a (patch) | |
| tree | 62784e4ce6a708398f018855b6d672de6b0345db /scumm/sound.cpp | |
| parent | 3f77642948a824e6e198c93a455fbf3fbab7e507 (diff) | |
| download | scummvm-rg350-e9269257f3da947eca3fb167b279fbe91650157a.tar.gz scummvm-rg350-e9269257f3da947eca3fb167b279fbe91650157a.tar.bz2 scummvm-rg350-e9269257f3da947eca3fb167b279fbe91650157a.zip | |
turned PlayingSoundHandle into an 'opaque' (well not really :-) data type, mainly because people kept (accidentally and sometimes on purpose :-) misusing them
svn-id: r11881
Diffstat (limited to 'scumm/sound.cpp')
| -rw-r--r-- | scumm/sound.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 4f241dd340..a8d94d2ba0 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -56,7 +56,6 @@ Sound::Sound(ScummEngine *parent) { memset(this,0,sizeof(Sound)); // palmos _scumm = parent; - _talkChannelHandle = 0; _currentCDSound = 0; _sfxFile = 0; @@ -427,7 +426,7 @@ void Sound::processSfxQueues() { if ((_sfxMode & 2) && _scumm->VAR(_scumm->VAR_TALK_ACTOR)) { act = _scumm->VAR(_scumm->VAR_TALK_ACTOR); - finished = !_talkChannelHandle; + finished = !_talkChannelHandle.isActive(); if (act != 0 && (uint) act < 0x80 && !_scumm->_string[0].no_talk_anim) { a = _scumm->derefActor(act, "processSfxQueues"); |