diff options
author | Johannes Schickel | 2008-04-26 22:29:27 +0000 |
---|---|---|
committer | Johannes Schickel | 2008-04-26 22:29:27 +0000 |
commit | dd98898a23d8dfffcfe95c70fa0b528e3f418332 (patch) | |
tree | 4f968e10c75548f96e87044229e65ca22d36ea22 /engines/kyra | |
parent | 71f4dee9ae22431ff78e8b46cf1a1feca173dae8 (diff) | |
download | scummvm-rg350-dd98898a23d8dfffcfe95c70fa0b528e3f418332.tar.gz scummvm-rg350-dd98898a23d8dfffcfe95c70fa0b528e3f418332.tar.bz2 scummvm-rg350-dd98898a23d8dfffcfe95c70fa0b528e3f418332.zip |
Implemented opcodes:
- 78: o3_disableInventory
- 79: o3_enableInventory
svn-id: r31739
Diffstat (limited to 'engines/kyra')
-rw-r--r-- | engines/kyra/kyra_v3.h | 2 | ||||
-rw-r--r-- | engines/kyra/script_v3.cpp | 18 |
2 files changed, 17 insertions, 3 deletions
diff --git a/engines/kyra/kyra_v3.h b/engines/kyra/kyra_v3.h index fbd9bcd487..e22340491b 100644 --- a/engines/kyra/kyra_v3.h +++ b/engines/kyra/kyra_v3.h @@ -741,6 +741,8 @@ private: int o3_setSceneDim(ScriptState *script); int o3_update(ScriptState *script); int o3_removeItemInstances(ScriptState *script); + int o3_disableInventory(ScriptState *script); + int o3_enableInventory(ScriptState *script); int o3_enterNewScene(ScriptState *script); int o3_setMalcolmPos(ScriptState *script); int o3_stopMusic(ScriptState *script); diff --git a/engines/kyra/script_v3.cpp b/engines/kyra/script_v3.cpp index 3cc2fd5b17..288b6720f9 100644 --- a/engines/kyra/script_v3.cpp +++ b/engines/kyra/script_v3.cpp @@ -742,6 +742,18 @@ int KyraEngine_v3::o3_removeItemInstances(ScriptState *script) { return deleted; } +int KyraEngine_v3::o3_disableInventory(ScriptState *script) { + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v3::o3_disableInventory(%p) ()", (const void *)script); + _enableInventory = false; + return 0; +} + +int KyraEngine_v3::o3_enableInventory(ScriptState *script) { + debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v3::o3_enableInventory(%p) ()", (const void *)script); + _enableInventory = true; + return 1; +} + int KyraEngine_v3::o3_enterNewScene(ScriptState *script) { debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v3::o3_enterNewScene(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4)); @@ -1347,9 +1359,9 @@ void KyraEngine_v3::setupOpcodeTable() { Opcode(o3_update); // 0x4c Opcode(o3_removeItemInstances); - OpcodeUnImpl(); - OpcodeUnImpl(); - OpcodeUnImpl(); + Opcode(o3_dummy); + Opcode(o3_disableInventory); + Opcode(o3_enableInventory); // 0x50 Opcode(o3_enterNewScene); OpcodeUnImpl(); |