[Scummvm-cvs-logs] SF.net SVN: scummvm: [32931] scummvm/trunk/sound/midiparser_xmidi.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 32931
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32931&view=rev
Author:   eriktorbjorn
Date:     2008-07-06 12:25:32 -0700 (Sun, 06 Jul 2008)

Log Message:
-----------
Fixed silly error. The NEXT_BREAK event should, of course, jump to the event
*after* the FOR_LOOP event. Apart from simplifying things, this should allow
limited number of repeats to work.

Modified Paths:
--------------
    scummvm/trunk/sound/midiparser_xmidi.cpp

Modified: scummvm/trunk/sound/midiparser_xmidi.cpp
===================================================================
--- scummvm/trunk/sound/midiparser_xmidi.cpp	2008-07-06 18:37:52 UTC (rev 32930)
+++ scummvm/trunk/sound/midiparser_xmidi.cpp	2008-07-06 19:25:32 UTC (rev 32931)
@@ -104,14 +104,12 @@
 
 		if (info.basic.param1 == 0x74) {
 			// XMIDI_CONTROLLER_FOR_LOOP
-			byte *pos = _position._play_pos - 3;
-			if (_loopCount < 0 || _loop[_loopCount].pos != pos) {
-				if (_loopCount < ARRAYSIZE(_loop) - 1)
-					_loopCount++;
+			byte *pos = _position._play_pos;
+			if (_loopCount < ARRAYSIZE(_loop) - 1)
+				_loopCount++;
 
-				_loop[_loopCount].pos = pos;
-				_loop[_loopCount].repeat = info.basic.param2;
-			}
+			_loop[_loopCount].pos = pos;
+			_loop[_loopCount].repeat = info.basic.param2;
 		} else if (info.basic.param1 == 0x75) {
 			// XMIDI_CONTROLLER_NEXT_BREAK
 			if (_loopCount >= 0) {


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