[Scummvm-cvs-logs] SF.net SVN: scummvm: [21156] scummvm/trunk/engines/scumm/imuse/imuse_player.cpp

[Jamieson630 at users.sourceforge.net]

Revision: 21156
Author:   Jamieson630
Date:     2006-03-08 19:29:12 -0800 (Wed, 08 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21156&view=rev

Log Message:
-----------
Implemented SysEx command 1 for non-S&M SCUMM games, per the latest comment on Bug 1088045.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse/imuse_player.cpp
Modified: scummvm/trunk/engines/scumm/imuse/imuse_player.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse/imuse_player.cpp	2006-03-09 03:21:23 UTC (rev 21155)
+++ scummvm/trunk/engines/scumm/imuse/imuse_player.cpp	2006-03-09 03:29:12 UTC (rev 21156)
@@ -456,10 +456,16 @@
 		break;
 
 	case 1:
-		// This SysEx is used in Sam & Max for maybe_jump.
-		if (_scanning)
-			break;
-		maybe_jump(p[0], p[1] - 1, (READ_BE_UINT16(p + 2) - 1) * 4 + p[4], ((p[5] * TICKS_PER_BEAT) >> 2) + p[6]);
+		if (_se->_game_id != GID_SAMNMAX) {
+			// Shut down a part. [Bug 1088045, comments]
+			part = getPart (p[0]);
+			if (part != NULL) part->uninit();
+		} else {
+			// Sam & Max: maybe_jump.
+			if (_scanning)
+				break;
+			maybe_jump(p[0], p[1] - 1, (READ_BE_UINT16(p + 2) - 1) * 4 + p[4], ((p[5] * TICKS_PER_BEAT) >> 2) + p[6]);
+		}
 		break;
 
 	case 2: // Start of song. Ignore for now.


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