[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.372,2.373 sound.cpp,1.228,1.229

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv15044/scumm

Modified Files:
	scummvm.cpp sound.cpp 
Log Message:

Remove sound looping hack for v2 amiga games.


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.372
retrieving revision 2.373
diff -u -d -r2.372 -r2.373
--- scummvm.cpp	6 Sep 2003 01:20:15 -0000	2.372
+++ scummvm.cpp	6 Sep 2003 01:44:29 -0000	2.373
@@ -237,7 +237,7 @@
 
 	switch (detector->_platform) {
 	case 1:
-		if (!(_features & GF_AMIGA))
+		if (!(detector->_game.features & GF_AMIGA))
 			detector->_game.features |= GF_AMIGA;
 		break;
 	case 2:

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -d -r1.228 -r1.229
--- sound.cpp	5 Sep 2003 22:53:36 -0000	1.228
+++ sound.cpp	6 Sep 2003 01:44:29 -0000	1.229
@@ -458,7 +458,6 @@
 	}
 
 	if ((_scumm->_features & GF_AMIGA) && (_scumm->_version <= 2)) {
-		// Some very basic sound effects support
 		if (READ_BE_UINT16(ptr + 14) == 0x0880) {
 			size = READ_BE_UINT16(ptr + 6);
 			int start = READ_BE_UINT16(ptr + 8);
@@ -474,17 +473,7 @@
 
 			sound = (char *)malloc(size);
 			memcpy(sound, ptr + start, size);
-
-			// Experimental sound looping support
-			// FIXME: Fingolfin says: this makes no sense, folks! "start" is used both as a byte offset,
-			// to determine where in the resource the sound data starts, *and* as a loop start offset.
-			// It's extremely unlikely that this is correct.
-			if (start == 108 || start == 106)
-				_scumm->_mixer->playRaw(NULL, sound, size, rate,
-						SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_LOOP, soundID, vol, 0,
-						start, size);
-			else
-				_scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_AUTOFREE, soundID, vol, 0);
+			_scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_AUTOFREE, soundID, vol, 0);
 			return;
 		}
 	}