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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Fri Jun 18 16:36:23 CEST 2010


Revision: 50019
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50019&view=rev
Author:   thebluegr
Date:     2010-06-18 14:36:22 +0000 (Fri, 18 Jun 2010)

Log Message:
-----------
Added an explanation about the invalid instruments used when using the Adlib driver in PQ2

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

Modified: scummvm/trunk/engines/sci/sound/drivers/adlib.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/adlib.cpp	2010-06-18 13:36:29 UTC (rev 50018)
+++ scummvm/trunk/engines/sci/sound/drivers/adlib.cpp	2010-06-18 14:36:22 UTC (rev 50019)
@@ -703,8 +703,15 @@
 
 void MidiDriver_AdLib::setPatch(int voice, int patch) {
 	if ((patch < 0) || ((uint)patch >= _patches.size())) {
-		// This happens a lot at least in pq2, seems to me as if it's meant for mt32 actually
-		warning("ADLIB: Invalid patch %i requested", patch);
+		// This happens a lot at least in PQ2. This game has a small patch.003 (1344 bytes),
+		// containing 48 instruments. However it has several songs which use instruments
+		// not specified in that patch (namely, songs 1, 3, 5, 9, 15,  16, 17, 23, 25, 27,
+		// 29, 32, 36, 38, 44, 45, 46 all use instruments not specified in patch.003).
+		// These were probably written for MT32. These warnings in PQ2 can probably go away
+		// if a bigger patch.003 file is used (one that contains all the instruments used
+		// by the songs, i.e. 5382 bytes)
+		warning("ADLIB: Invalid patch %i requested (patch.003 contains %d instruments)", 
+			patch, _patches.size());
 		patch = 0;
 	}
 


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




More information about the Scummvm-git-logs mailing list