[Scummvm-cvs-logs] scummvm master -> 398b4353a62cd5d5d4eda2c8e56bc75de350fa72
Strangerke
Strangerke at scummvm.org
Fri Apr 19 08:06:36 CEST 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
398b4353a6 HOPKINS: Remove dead code and out of bound access in SoundManager
Commit: 398b4353a62cd5d5d4eda2c8e56bc75de350fa72
https://github.com/scummvm/scummvm/commit/398b4353a62cd5d5d4eda2c8e56bc75de350fa72
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-04-18T23:05:29-07:00
Commit Message:
HOPKINS: Remove dead code and out of bound access in SoundManager
Changed paths:
engines/hopkins/sound.cpp
diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index d8dfba5..1507cfa 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -634,8 +634,6 @@ void SoundManager::removeSample(int soundIndex) {
stopVoice(1);
if (checkVoiceStatus(2))
stopVoice(2);
- if (checkVoiceStatus(3))
- stopVoice(3);
removeWavSample(soundIndex);
_sound[soundIndex]._active = false;
}
@@ -703,7 +701,6 @@ void SoundManager::playSample(int wavIndex, int voiceMode) {
switch (voiceMode) {
case 5:
- case 8:
// Case added to identify the former PLAY_SAMPLE2 calls
case 9:
if (checkVoiceStatus(1))
@@ -715,11 +712,6 @@ void SoundManager::playSample(int wavIndex, int voiceMode) {
stopVoice(1);
playWavSample(2, wavIndex);
break;
- case 7:
- if (checkVoiceStatus(3))
- stopVoice(1);
- playWavSample(3, wavIndex);
- break;
default:
break;
}
More information about the Scummvm-git-logs
mailing list