[Scummvm-cvs-logs] SF.net SVN: scummvm:[54465] scummvm/trunk/engines/sci/sound/drivers/midi. cpp

[thebluegr at users.sourceforge.net]

Revision: 54465
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54465&view=rev
Author:   thebluegr
Date:     2010-11-25 01:31:03 +0000 (Thu, 25 Nov 2010)

Log Message:
-----------
SCI: Set _useMT32Track correctly for KQ5 Windows, thus simplifying the code

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/drivers/midi.cpp

Modified: scummvm/trunk/engines/sci/sound/drivers/midi.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/midi.cpp	2010-11-25 01:19:45 UTC (rev 54464)
+++ scummvm/trunk/engines/sci/sound/drivers/midi.cpp	2010-11-25 01:31:03 UTC (rev 54465)
@@ -841,8 +841,10 @@
 	}
 
 	// Don't do any mapping for the Windows version of KQ5CD
-	if (g_sci && g_sci->getGameId() == GID_KQ5 && g_sci->getPlatform() == Common::kPlatformWindows)
+	if (g_sci && g_sci->getGameId() == GID_KQ5 && g_sci->getPlatform() == Common::kPlatformWindows) {
+		_useMT32Track = false;
 		return 0;
+	}
 
 	Resource *res = NULL;
 
@@ -967,15 +969,10 @@
 	case SCI_VERSION_0_LATE:
 		return 0x01;
 	default:
-		if (_isMt32) {
+		if (_isMt32)
 			return 0x0c;
-		} else {
-			// Use the GM play mask for the Windows version of KQ5CD.
-			if (g_sci && g_sci->getGameId() == GID_KQ5 && g_sci->getPlatform() == Common::kPlatformWindows)
-				return 0x07;
-
+		else
 			return _useMT32Track ? 0x0c : 0x07;
-		}
 	}
 }
 


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