libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-18 15:48:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HOPKINS: Simplify a couple of tests in SoundManager

Browse Source
This commit is contained in:
Strangerke 2013-03-21 07:19:10 +01:00
parent 8467ea81c8
commit 510eb83aac
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
engines/hopkins/sound.cpp
View File

@ -732,10 +732,8 @@ void SoundManager::stopVoice(int voiceIndex) {
if (_voice[voiceIndex]._status) {
_voice[voiceIndex]._status = false;
int wavIndex = _voice[voiceIndex]._wavIndex;
if (_sWav[wavIndex]._active) {
if (_sWav[wavIndex]._freeSampleFl)
removeWavSample(wavIndex);
}
if (_sWav[wavIndex]._active && _sWav[wavIndex]._freeSampleFl)
removeWavSample(wavIndex);
}
_voice[voiceIndex]._status = false;
}
@ -802,21 +800,23 @@ void SoundManager::loadWav(const Common::String &file, int wavIndex) {
}
void SoundManager::playWav(int wavIndex) {
if (!_soundFl && !_soundOffFl) {
_soundFl = true;
_currentSoundIndex = wavIndex;
playWavSample(1, wavIndex);
}
if (_soundFl || _soundOffFl)
return;
_soundFl = true;
_currentSoundIndex = wavIndex;
playWavSample(1, wavIndex);
}
void SoundManager::delWav(int wavIndex) {
if (removeWavSample(wavIndex)) {
if (checkVoiceStatus(1))
stopVoice(1);
if (!removeWavSample(wavIndex))
return;
_currentSoundIndex = 0;
_soundFl = false;
}
if (checkVoiceStatus(1))
stopVoice(1);
_currentSoundIndex = 0;
_soundFl = false;
}
void SoundManager::playWavSample(int voiceIndex, int wavIndex) {