aboutsummaryrefslogtreecommitdiff
path: root/engines/hopkins
diff options
context:
space:
mode:
authorStrangerke2013-04-19 08:05:29 +0200
committerStrangerke2013-04-19 08:05:29 +0200
commit398b4353a62cd5d5d4eda2c8e56bc75de350fa72 (patch)
tree76e3ae201b79989767e8aa0d2933300383a9d976 /engines/hopkins
parent6de13b475e51d429dcf30c983e575289fb0901db (diff)
downloadscummvm-rg350-398b4353a62cd5d5d4eda2c8e56bc75de350fa72.tar.gz
scummvm-rg350-398b4353a62cd5d5d4eda2c8e56bc75de350fa72.tar.bz2
scummvm-rg350-398b4353a62cd5d5d4eda2c8e56bc75de350fa72.zip
HOPKINS: Remove dead code and out of bound access in SoundManager
Diffstat (limited to 'engines/hopkins')
-rw-r--r--engines/hopkins/sound.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index d8dfba5246..1507cfab02 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;
}