aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/script_mr.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2008-05-11 15:24:25 +0000
committerJohannes Schickel2008-05-11 15:24:25 +0000
commit4932660f13b08aa30a88d53c1948c1df190201b7 (patch)
tree3ece7a7c9c96e0b95ef9d0f95ee5a5d01ba89f7a /engines/kyra/script_mr.cpp
parent57dfdbc6c865bfc804fd93b813982b9ca41931e4 (diff)
downloadscummvm-rg350-4932660f13b08aa30a88d53c1948c1df190201b7.tar.gz
scummvm-rg350-4932660f13b08aa30a88d53c1948c1df190201b7.tar.bz2
scummvm-rg350-4932660f13b08aa30a88d53c1948c1df190201b7.zip
- Implemented kyra3 album (page switch animation not yet implemented)
- Implemented opcode 25: o3_showAlbum svn-id: r32022
Diffstat (limited to 'engines/kyra/script_mr.cpp')
-rw-r--r--engines/kyra/script_mr.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/kyra/script_mr.cpp b/engines/kyra/script_mr.cpp
index 6cbe58c0c1..0142a06b7d 100644
--- a/engines/kyra/script_mr.cpp
+++ b/engines/kyra/script_mr.cpp
@@ -134,6 +134,12 @@ int KyraEngine_MR::o3_hideBadConscience(EMCState *script) {
return 0;
}
+int KyraEngine_MR::o3_showAlbum(EMCState *script) {
+ debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_showAlbum(%p) ()", (const void *)script);
+ showAlbum();
+ return 0;
+}
+
int KyraEngine_MR::o3_setInventorySlot(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_setInventorySlot(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
const int slot = MAX<int16>(0, MIN<int16>(10, stackPos(0)));
@@ -1176,7 +1182,7 @@ void KyraEngine_MR::setupOpcodeTable() {
Opcode(o3_hideBadConscience);
// 0x18
OpcodeUnImpl();
- OpcodeUnImpl();
+ Opcode(o3_showAlbum);
Opcode(o3_setInventorySlot);
Opcode(o3_getInventorySlot);
// 0x1c