From c24712546906d505ce5030c9494fadfe46f64632 Mon Sep 17 00:00:00 2001 From: uruk Date: Wed, 13 Aug 2014 20:35:31 +0200 Subject: [PATCH] CGE2: Rename _soundHandle to _sfxHandle. --- engines/cge2/sound.cpp | 6 +++--- engines/cge2/sound.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/engines/cge2/sound.cpp b/engines/cge2/sound.cpp index a3accdfa920..32f94b17b9c 100644 --- a/engines/cge2/sound.cpp +++ b/engines/cge2/sound.cpp @@ -93,7 +93,7 @@ void Sound::sndDigiStart(SmpInfo *PSmpInfo, Audio::Mixer::SoundType soundType) { Audio::SoundHandle *handle = nullptr; switch (soundType) { case Audio::Mixer::kSFXSoundType: - handle = &_soundHandle; + handle = &_sfxHandle; break; case Audio::Mixer::kSpeechSoundType: handle = &_speechHandle; @@ -114,13 +114,13 @@ void Sound::sndDigiStart(SmpInfo *PSmpInfo, Audio::Mixer::SoundType soundType) { } void Sound::stop() { - sndDigiStop(_soundHandle); + sndDigiStop(_sfxHandle); sndDigiStop(_speechHandle); _audioStream = nullptr; } void Sound::checkSoundHandles() { - if (!_vm->_mixer->isSoundHandleActive(_speechHandle) && !_vm->_mixer->isSoundHandleActive(_soundHandle)) + if (!_vm->_mixer->isSoundHandleActive(_speechHandle) && !_vm->_mixer->isSoundHandleActive(_sfxHandle)) _smpinf._counter = 0; } diff --git a/engines/cge2/sound.h b/engines/cge2/sound.h index 2960dc32e44..6673b67b7a4 100644 --- a/engines/cge2/sound.h +++ b/engines/cge2/sound.h @@ -80,7 +80,7 @@ public: private: int _soundRepeatCount; CGE2Engine *_vm; - Audio::SoundHandle _soundHandle; + Audio::SoundHandle _sfxHandle; Audio::SoundHandle _speechHandle; Audio::RewindableAudioStream *_audioStream;