[Scummvm-cvs-logs] SF.net SVN: scummvm:[55457] scummvm/trunk/engines/mohawk

[mthreepwood at users.sourceforge.net]

Revision: 55457
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55457&view=rev
Author:   mthreepwood
Date:     2011-01-23 05:12:50 +0000 (Sun, 23 Jan 2011)

Log Message:
-----------
MOHAWK: Cleanup Riven opcode 12 (now known as stopSound())

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/riven_scripts.cpp
    scummvm/trunk/engines/mohawk/riven_scripts.h

Modified: scummvm/trunk/engines/mohawk/riven_scripts.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/riven_scripts.cpp	2011-01-23 03:46:38 UTC (rev 55456)
+++ scummvm/trunk/engines/mohawk/riven_scripts.cpp	2011-01-23 05:12:50 UTC (rev 55457)
@@ -107,7 +107,7 @@
 		OPCODE(disableHotspot),
 		OPCODE(empty),						// Empty
 		// 0x0C (12 decimal)
-		OPCODE(clearSLST),
+		OPCODE(stopSound),
 		OPCODE(changeCursor),
 		OPCODE(delay),
 		OPCODE(empty),						// Empty
@@ -392,10 +392,19 @@
 	}
 }
 
-// Command 12: clear slst records (flags)
-void RivenScript::clearSLST(uint16 op, uint16 argc, uint16 *argv) {
-	warning ("STUB: clearSLST: Fade Out = %s, Fade In = %s", ((argv[0] & 1) != 0) ? "Yes" : "No", ((argv[0] & 2) != 0) ? "Yes" : "No");
-	//_vm->_sound->clearAllSLST();
+// Command 12: stop sounds (flags)
+void RivenScript::stopSound(uint16 op, uint16 argc, uint16 *argv) {
+	// The argument is a bitflag for the setting.
+	// bit 0 is normal sound stopping (unused)
+	// bit 1 is ambient sound stopping
+	// Having no flags set means clear all
+
+	// TODO: Enable this once empty SLST entries are properly handled
+	//if (argv[0] & 2 || argv[0] == 0)
+	//	_vm->_sound->stopAllSLST();
+
+	if (argv[0] & 1)
+		warning("Unhandled stopSound() flag");
 }
 
 // Command 13: set mouse cursor (cursor_id)

Modified: scummvm/trunk/engines/mohawk/riven_scripts.h
===================================================================
--- scummvm/trunk/engines/mohawk/riven_scripts.h	2011-01-23 03:46:38 UTC (rev 55456)
+++ scummvm/trunk/engines/mohawk/riven_scripts.h	2011-01-23 05:12:50 UTC (rev 55457)
@@ -96,7 +96,7 @@
 	DECLARE_OPCODE(mohawkSwitch);
 	DECLARE_OPCODE(enableHotspot);
 	DECLARE_OPCODE(disableHotspot);
-	DECLARE_OPCODE(clearSLST);
+	DECLARE_OPCODE(stopSound);
 	DECLARE_OPCODE(changeCursor);
 	DECLARE_OPCODE(delay);
 	DECLARE_OPCODE(runExternalCommand);


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