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

[lordhoto at users.sourceforge.net]

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

Log Message:
-----------
Implemented opcode 34: o3_resetInventory.

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:30:55 UTC (rev 31740)
+++ scummvm/trunk/engines/kyra/kyra_v3.h	2008-04-26 22:33:07 UTC (rev 31741)
@@ -714,6 +714,7 @@
 	int o3_addItemToCurScene(ScriptState *script);
 	int o3_objectChat(ScriptState *script);
 	int o3_checkForItem(ScriptState *script);
+	int o3_resetInventory(ScriptState *script);
 	int o3_defineItem(ScriptState *script);
 	int o3_npcChatSequence(ScriptState *script);
 	int o3_queryGameFlag(ScriptState *script);

Modified: scummvm/trunk/engines/kyra/script_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v3.cpp	2008-04-26 22:30:55 UTC (rev 31740)
+++ scummvm/trunk/engines/kyra/script_v3.cpp	2008-04-26 22:33:07 UTC (rev 31741)
@@ -255,6 +255,12 @@
 	return findItem(stackPos(0), stackPos(1)) == -1 ? 0 : 1;
 }
 
+int KyraEngine_v3::o3_resetInventory(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v3::o3_resetInventory(%p) ()", (const void *)script);
+	memset(_mainCharacter.inventory, -1, sizeof(_mainCharacter.inventory));
+	return 0;
+}
+
 int KyraEngine_v3::o3_defineItem(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v3::o3_defineItem(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	int freeItem = findFreeItem();
@@ -1316,7 +1322,7 @@
 	// 0x20
 	Opcode(o3_checkForItem);
 	Opcode(o3_dummy);
-	OpcodeUnImpl();
+	Opcode(o3_resetInventory);
 	Opcode(o3_defineItem);
 	// 0x24
 	OpcodeUnImpl();


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