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

[lordhoto at users.sourceforge.net]

Revision: 31739
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31739&view=rev
Author:   lordhoto
Date:     2008-04-26 15:29:27 -0700 (Sat, 26 Apr 2008)

Log Message:
-----------
Implemented opcodes:
 - 78: o3_disableInventory
 - 79: o3_enableInventory

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v3.h
    scummvm/trunk/engines/kyra/script_v3.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v3.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v3.h	2008-04-26 22:22:21 UTC (rev 31738)
+++ scummvm/trunk/engines/kyra/kyra_v3.h	2008-04-26 22:29:27 UTC (rev 31739)
@@ -741,6 +741,8 @@
 	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);

Modified: scummvm/trunk/engines/kyra/script_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v3.cpp	2008-04-26 22:22:21 UTC (rev 31738)
+++ scummvm/trunk/engines/kyra/script_v3.cpp	2008-04-26 22:29:27 UTC (rev 31739)
@@ -742,6 +742,18 @@
 	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 @@
 	Opcode(o3_update);
 	// 0x4c
 	Opcode(o3_removeItemInstances);
-	OpcodeUnImpl();
-	OpcodeUnImpl();
-	OpcodeUnImpl();
+	Opcode(o3_dummy);
+	Opcode(o3_disableInventory);
+	Opcode(o3_enableInventory);
 	// 0x50
 	Opcode(o3_enterNewScene);
 	OpcodeUnImpl();


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