aboutsummaryrefslogtreecommitdiff
path: root/queen/sound.cpp
diff options
context:
space:
mode:
authorMax Horn2003-12-24 00:25:18 +0000
committerMax Horn2003-12-24 00:25:18 +0000
commite9269257f3da947eca3fb167b279fbe91650157a (patch)
tree62784e4ce6a708398f018855b6d672de6b0345db /queen/sound.cpp
parent3f77642948a824e6e198c93a455fbf3fbab7e507 (diff)
downloadscummvm-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 'queen/sound.cpp')
-rw-r--r--queen/sound.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/queen/sound.cpp b/queen/sound.cpp
index f907873246..d1b7e56986 100644
--- a/queen/sound.cpp
+++ b/queen/sound.cpp
@@ -33,7 +33,7 @@
namespace Queen {
Sound::Sound(SoundMixer *mixer, QueenEngine *vm) :
- _mixer(mixer), _vm(vm), _sfxToggle(true), _speechToggle(true), _musicToggle(true), _lastOverride(0), _currentSong(0), _sfxHandle(0) {
+ _mixer(mixer), _vm(vm), _sfxToggle(true), _speechToggle(true), _musicToggle(true), _lastOverride(0), _currentSong(0) {
}
Sound::~Sound() {
@@ -68,7 +68,7 @@ Sound *Sound::giveSound(SoundMixer *mixer, QueenEngine *vm, uint8 compression) {
}
void Sound::waitSfxFinished() {
- while(_sfxHandle != 0)
+ while(_sfxHandle.isActive())
_vm->input()->delay(10);
}