[Scummvm-cvs-logs] scummvm master -> 96ae10c7491aed3258912ef91c8787b7975376ad

[digitall]

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:
96ae10c749 DREAMWEB: Removal of dead code and cleanup in sound code.


Commit: 96ae10c7491aed3258912ef91c8787b7975376ad
    https://github.com/scummvm/scummvm/commit/96ae10c7491aed3258912ef91c8787b7975376ad
Author: D G Turner (digitall at scummvm.org)
Date: 2012-05-29T19:53:52-07:00

Commit Message:
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.

Changed paths:
    engines/dreamweb/sound.cpp



diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp
index b3d5db9..fcbcb9d 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);