[Scummvm-cvs-logs] SF.net SVN: scummvm:[42898] scummvm/trunk/engines/scumm

[fingolfin at users.sourceforge.net]

Revision: 42898
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42898&view=rev
Author:   fingolfin
Date:     2009-07-29 18:35:34 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
SCUMM: Enable looping in Indy3Mac sound effects

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script.cpp
    scummvm/trunk/engines/scumm/sound.cpp

Modified: scummvm/trunk/engines/scumm/script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script.cpp	2009-07-29 16:39:12 UTC (rev 42897)
+++ scummvm/trunk/engines/scumm/script.cpp	2009-07-29 18:35:34 UTC (rev 42898)
@@ -1179,7 +1179,7 @@
 		args[4] = VAR(VAR_VIRT_MOUSE_Y);
 	}
 
-	// Macintosh verison of indy3ega used different interface, so adjust values.
+	// Macintosh version of indy3ega used different interface, so adjust values.
 	if (_game.id == GID_INDY3 && _game.platform == Common::kPlatformMacintosh) {
 		if (clickArea == kVerbClickArea && (val >= 101 && val <= 108)) {
 			if (val == 107) {

Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp	2009-07-29 16:39:12 UTC (rev 42897)
+++ scummvm/trunk/engines/scumm/sound.cpp	2009-07-29 18:35:34 UTC (rev 42898)
@@ -420,17 +420,16 @@
 		sound = (char *)malloc(size);
 		int vol = ptr[24] * 4;
 		int loopStart = 0, loopEnd = 0;
-#if 0	// Disabling this until after 0.11.0
 		int loopcount = ptr[27];
 		if (loopcount > 1) {
 			// TODO: We can only loop once, or infinitely many times, but
 			// have no support for a finite number of repetitions.
-			// This is
+			// So far, I have seen only 1 and 255 (for infinite repetitions),
+			// so maybe this is not really a problem.
 			loopStart = READ_BE_UINT16(ptr + 10) - READ_BE_UINT16(ptr + 8);
 			loopEnd = READ_BE_UINT16(ptr + 14);
 			flags |= Audio::Mixer::FLAG_LOOP;
 		}
-#endif
 
 		memcpy(sound, ptr + READ_BE_UINT16(ptr + 8), size);
 		_mixer->playRaw(Audio::Mixer::kSFXSoundType, NULL, sound, size, rate,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.