aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2008-03-27 23:12:45 +0000
committerJohannes Schickel2008-03-27 23:12:45 +0000
commit7a683ae43602533aa22b31c15fbd765043c3c763 (patch)
treec36bddbda995c61248192fd00f2532bfa70148a5 /engines
parent42ff616533ab9bf4a1f88a16bd82ce88359940f3 (diff)
downloadscummvm-rg350-7a683ae43602533aa22b31c15fbd765043c3c763.tar.gz
scummvm-rg350-7a683ae43602533aa22b31c15fbd765043c3c763.tar.bz2
scummvm-rg350-7a683ae43602533aa22b31c15fbd765043c3c763.zip
Implemented opcodes:
- 164: o2_getSfxDriver - 165: o2_getVocSupport - 166: o2_getMusicDriver svn-id: r31275
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/kyra_v2.h3
-rw-r--r--engines/kyra/script_v2.cpp22
2 files changed, 22 insertions, 3 deletions
diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h
index 5a6f55ceeb..31c08083e9 100644
--- a/engines/kyra/kyra_v2.h
+++ b/engines/kyra/kyra_v2.h
@@ -1087,6 +1087,9 @@ protected:
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);
diff --git a/engines/kyra/script_v2.cpp b/engines/kyra/script_v2.cpp
index f60ae099d0..cce34de2fa 100644
--- a/engines/kyra/script_v2.cpp
+++ b/engines/kyra/script_v2.cpp
@@ -1599,6 +1599,22 @@ int KyraEngine_v2::o2_getBoolFromStack(ScriptState *script) {
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 @@ void KyraEngine_v2::setupOpcodeTable() {
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),