aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorD G Turner2012-05-30 03:53:52 +0100
committerD G Turner2012-05-30 03:53:52 +0100
commit96ae10c7491aed3258912ef91c8787b7975376ad (patch)
tree60aa2d4b4f053f0f9739135daad500a70bdf352a
parentbe25e31a0a2da25c586a16a16ba9d55053f21524 (diff)
downloadscummvm-rg350-96ae10c7491aed3258912ef91c8787b7975376ad.tar.gz
scummvm-rg350-96ae10c7491aed3258912ef91c8787b7975376ad.tar.bz2
scummvm-rg350-96ae10c7491aed3258912ef91c8787b7975376ad.zip
DREAMWEB: Removal of dead code and cleanup in sound code.
The removed blocks in the playChannel<n> functions referencing index are non-functional leftovers from more complex logic in the original code structure, and thus can be safely removed.
-rw-r--r--engines/dreamweb/sound.cpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp
index b3d5db9e0d..fcbcb9d0a0 100644
--- a/engines/dreamweb/sound.cpp
+++ b/engines/dreamweb/sound.cpp
@@ -40,7 +40,6 @@ bool DreamWebEngine::loadSpeech(byte type1, int idx1, byte type2, int idx2) {
return result;
}
-
void DreamWebEngine::volumeAdjust() {
if (_volumeDirection == 0)
return;
@@ -57,9 +56,6 @@ void DreamWebEngine::volumeAdjust() {
void DreamWebEngine::playChannel0(uint8 index, uint8 repeat) {
debug(1, "playChannel0(index:%d, repeat:%d)", index, repeat);
_channel0Playing = index;
- if (index >= 12)
- index -= 12;
-
_channel0Repeat = repeat;
}
@@ -68,14 +64,12 @@ void DreamWebEngine::playChannel1(uint8 index) {
return;
_channel1Playing = index;
- if (index >= 12)
- index -= 12;
}
void DreamWebEngine::cancelCh0() {
debug(1, "cancelCh0()");
- _channel0Repeat = 0;
_channel0Playing = 255;
+ _channel0Repeat = 0;
stopSound(0);
}
@@ -104,11 +98,6 @@ void DreamWebEngine::loadRoomsSample() {
loadSounds(1, sampleSuffix.c_str());
}
-} // End of namespace DreamWeb
-
-
-namespace DreamWeb {
-
void DreamWebEngine::playSound(uint8 channel, uint8 id, uint8 loops) {
debug(1, "playSound(%u, %u, %u)", channel, id, loops);