[Scummvm-cvs-logs] SF.net SVN: scummvm: [31275] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 31275
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31275&view=rev
Author:   lordhoto
Date:     2008-03-27 16:12:45 -0700 (Thu, 27 Mar 2008)

Log Message:
-----------
Implemented opcodes:
 - 164: o2_getSfxDriver
 - 165: o2_getVocSupport
 - 166: o2_getMusicDriver

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v2.h
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v2.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.h	2008-03-27 22:34:17 UTC (rev 31274)
+++ scummvm/trunk/engines/kyra/kyra_v2.h	2008-03-27 23:12:45 UTC (rev 31275)
@@ -1087,6 +1087,9 @@
 	int o2_getRainbowRoomData(ScriptState *script);
 	int o2_drawSceneShapeEx(ScriptState *script);
 	int o2_getBoolFromStack(ScriptState *script);
+	int o2_getSfxDriver(ScriptState *script);
+	int o2_getVocSupport(ScriptState *script);
+	int o2_getMusicDriver(ScriptState *script);
 	int o2_setVocHigh(ScriptState *script);
 	int o2_getVocHigh(ScriptState *script);
 	int o2_zanthiaChat(ScriptState *script);

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-27 22:34:17 UTC (rev 31274)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-27 23:12:45 UTC (rev 31275)
@@ -1599,6 +1599,22 @@
 	return stackPos(0) ? 1 : 0;
 }
 
+int KyraEngine_v2::o2_getSfxDriver(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getSfxDriver(%p) ()", (const void *)script);
+	return 1;	// HACK: this is AdLib driver, maybe we should return 6 for MT-32 or 7 for General MIDI too when we're using that
+}
+
+int KyraEngine_v2::o2_getVocSupport(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getVocSupport(%p) ()", (const void *)script);
+	// we always support VOC file playback
+	return 1;
+}
+
+int KyraEngine_v2::o2_getMusicDriver(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_getMusicDriver(%p) ()", (const void *)script);
+	return 1;	// HACK: this is AdLib driver, maybe we should return 6 for MT-32 or 7 for General MIDI too when we're using that
+}
+
 int KyraEngine_v2::o2_setVocHigh(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_setVocHigh(%p) (%d)", (const void *)script, stackPos(0));
 	_vocHigh = stackPos(0);
@@ -1899,9 +1915,9 @@
 		Opcode(o2_drawSceneShapeEx),
 		Opcode(o2_getBoolFromStack),
 		// 0xa4
-		OpcodeUnImpl(),
-		OpcodeUnImpl(),
-		OpcodeUnImpl(),
+		Opcode(o2_getSfxDriver),
+		Opcode(o2_getVocSupport),
+		Opcode(o2_getMusicDriver),
 		Opcode(o2_setVocHigh),
 		// 0xa8
 		Opcode(o2_getVocHigh),


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