[Scummvm-cvs-logs] SF.net SVN: scummvm:[42891] scummvm/branches/branch-1-0-0/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 42891
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42891&view=rev
Author:   lordhoto
Date:     2009-07-29 14:58:31 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
Backport of r42890: Fix animation script sound effect opcode implementation in Kyra3.

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/kyra/kyra_mr.h
    scummvm/branches/branch-1-0-0/engines/kyra/script_mr.cpp

Modified: scummvm/branches/branch-1-0-0/engines/kyra/kyra_mr.h
===================================================================
--- scummvm/branches/branch-1-0-0/engines/kyra/kyra_mr.h	2009-07-29 14:54:27 UTC (rev 42890)
+++ scummvm/branches/branch-1-0-0/engines/kyra/kyra_mr.h	2009-07-29 14:58:31 UTC (rev 42891)
@@ -495,6 +495,7 @@
 	bool _useFrameTable;
 
 	int o3a_setCharacterFrame(EMCState *script);
+	int o3a_playSoundEffect(EMCState *script);
 
 	// special shape code
 	int initAnimationShapes(uint8 *filedata);

Modified: scummvm/branches/branch-1-0-0/engines/kyra/script_mr.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/kyra/script_mr.cpp	2009-07-29 14:54:27 UTC (rev 42890)
+++ scummvm/branches/branch-1-0-0/engines/kyra/script_mr.cpp	2009-07-29 14:58:31 UTC (rev 42891)
@@ -1114,6 +1114,12 @@
 	return 0;
 }
 
+int KyraEngine_MR::o3a_playSoundEffect(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3a_playSoundEffect(%p) (%d)", (const void *)script, stackPos(0));
+	snd_playSoundEffect(stackPos(0), 200);
+	return 0;
+}
+
 #pragma mark -
 
 int KyraEngine_MR::o3d_updateAnim(EMCState *script) {
@@ -1374,7 +1380,7 @@
 	// 0x00
 	Opcode(o2a_setAnimationShapes);
 	Opcode(o3a_setCharacterFrame);
-	Opcode(o3_playSoundEffect);
+	Opcode(o3a_playSoundEffect);
 	Opcode(o3_dummy);
 	// 0x04
 	Opcode(o2a_setResetFrame);


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