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 /sword1 | |
| 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 'sword1')
| -rw-r--r-- | sword1/sound.cpp | 4 | ||||
| -rw-r--r-- | sword1/sword1.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sword1/sound.cpp b/sword1/sound.cpp index da7ccdd736..2e2fb15a41 100644 --- a/sword1/sound.cpp +++ b/sword1/sound.cpp @@ -79,7 +79,7 @@ void SwordSound::engine(void) { if (_fxQueue[cnt2].delay == 0) playSample(&_fxQueue[cnt2]); } else { - if (!_fxQueue[cnt2].handle) { // sound finished + if (!_fxQueue[cnt2].handle.isActive()) { // sound finished _resMan->resClose(_fxList[_fxQueue[cnt2].id].sampleId); if (cnt2 != _endOfQueue-1) _fxQueue[cnt2] = _fxQueue[_endOfQueue - 1]; @@ -109,7 +109,7 @@ bool SwordSound::amISpeaking(void) { } bool SwordSound::speechFinished(void) { - return (_speechHandle == 0); + return !_speechHandle.isActive(); } void SwordSound::newScreen(uint32 screen) { diff --git a/sword1/sword1.h b/sword1/sword1.h index 1a93a511e0..b169ad861c 100644 --- a/sword1/sword1.h +++ b/sword1/sword1.h @@ -22,7 +22,6 @@ #include <stdio.h> #include "base/engine.h" #include "common/util.h" -#include "sound/mixer.h" #include "base/gameDetector.h" #include "sworddefs.h" |