[Scummvm-cvs-logs] SF.net SVN: scummvm:[47660] scummvm/trunk/engines/sci/engine/ksound.cpp

[lskovlun at users.sourceforge.net]

Revision: 47660
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47660&view=rev
Author:   lskovlun
Date:     2010-01-28 23:11:55 +0000 (Thu, 28 Jan 2010)

Log Message:
-----------
SCI: Make SQ6 sound work. The meaning of these extra parameters is not yet understood.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/ksound.cpp

Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp	2010-01-28 22:58:09 UTC (rev 47659)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp	2010-01-28 23:11:55 UTC (rev 47660)
@@ -106,10 +106,12 @@
 		if (argc == 2) {
 			module = 65535;
 			number = argv[1].toUint16();
-		} else if (argc == 6) {
+		} else if (argc == 6 || argc == 8) {
 			module = argv[1].toUint16();
 			number = ((argv[2].toUint16() & 0xff) << 24) | ((argv[3].toUint16() & 0xff) << 16) |
 					 ((argv[4].toUint16() & 0xff) <<  8) | (argv[5].toUint16() & 0xff);
+			if (argc == 8)
+				warning("kDoAudio: Play called with SQ6 extra parameters");
 		} else {
 			warning("kDoAudio: Play called with an unknown number of parameters (%d)", argc);
 			return NULL_REG;


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