aboutsummaryrefslogtreecommitdiff
path: root/engines/neverhood/sound.cpp
diff options
context:
space:
mode:
authorjohndoe1232012-10-04 17:44:48 +0000
committerWillem Jan Palenstijn2013-05-08 20:43:47 +0200
commit7b0b3000a771e423deb840bf6789c7a73e90db6f (patch)
tree430edf19c1ee3e87d65c242408f842cc7f15f19c /engines/neverhood/sound.cpp
parentf77b12cf96aaebb47a1ead1b7daf25e75dd5abf4 (diff)
downloadscummvm-rg350-7b0b3000a771e423deb840bf6789c7a73e90db6f.tar.gz
scummvm-rg350-7b0b3000a771e423deb840bf6789c7a73e90db6f.tar.bz2
scummvm-rg350-7b0b3000a771e423deb840bf6789c7a73e90db6f.zip
NEVERHOOD: Rename stuff in Module1200
- Remove unused countdowns/code in AsScene1201Creature - Fix AudioResourceMan::isSoundPlaying
Diffstat (limited to 'engines/neverhood/sound.cpp')
-rw-r--r--engines/neverhood/sound.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/neverhood/sound.cpp b/engines/neverhood/sound.cpp
index c1db48c637..18f40dccaa 100644
--- a/engines/neverhood/sound.cpp
+++ b/engines/neverhood/sound.cpp
@@ -616,7 +616,7 @@ void AudioResourceMan::stopSound(int16 soundIndex) {
bool AudioResourceMan::isSoundPlaying(int16 soundIndex) {
AudioResourceManSoundItem *soundItem = _soundItems[soundIndex];
- return soundItem->_isPlaying;
+ return _vm->_mixer->isSoundHandleActive(soundItem->_soundHandle);
}
int16 AudioResourceMan::loadMusic(uint32 fileHash) {