[Scummvm-cvs-logs] SF.net SVN: scummvm:[40860] scummvm/trunk/engines/tinsel/music.cpp

[Hkz at users.sourceforge.net]

Revision: 40860
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40860&view=rev
Author:   Hkz
Date:     2009-05-24 13:20:13 +0000 (Sun, 24 May 2009)

Log Message:
-----------
tinsel: disable midi playing for Discworld PSX, as the game uses the proprietary (and unsupported) PlayStation SEQ format

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/music.cpp

Modified: scummvm/trunk/engines/tinsel/music.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/music.cpp	2009-05-24 12:56:06 UTC (rev 40859)
+++ scummvm/trunk/engines/tinsel/music.cpp	2009-05-24 13:20:13 UTC (rev 40860)
@@ -179,6 +179,11 @@
 	currentMidi = dwFileOffset;
 	currentLoop = bLoop;
 
+	// Tinsel V1 PSX uses a different music format, so i
+	// disable it here.
+	// TODO: Maybe this should be moved to a better place...
+	if (TinselV1PSX) return false;
+
 	if (volMusic != 0) {
 		SetMidiVolume(volMusic);
 	}
@@ -327,7 +332,8 @@
 	Common::File midiStream;
 
 	// Demo version has no midi file
-	if ((_vm->getFeatures() & GF_DEMO) || (TinselVersion == TINSEL_V2))
+	// Also, Discworld PSX uses still unsupported psx SEQ format for music...
+	if ((_vm->getFeatures() & GF_DEMO) || (TinselVersion == TINSEL_V2) || TinselV1PSX)
 		return;
 
 	if (midiBuffer.pDat)


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