CGE2: Rename _soundHandle to _sfxHandle.

scummvm · Aug 13, 2014 · c247125 · c247125
1 parent 28a4509
commit c247125
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -80,7 +80,7 @@ class Sound {
 private:
 	int _soundRepeatCount;
 	CGE2Engine *_vm;
-	Audio::SoundHandle _soundHandle;
+	Audio::SoundHandle _sfxHandle;
 	Audio::SoundHandle _speechHandle;
 	Audio::RewindableAudioStream *_audioStream;