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

[lordhoto at users.sourceforge.net]

Revision: 31145
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31145&view=rev
Author:   lordhoto
Date:     2008-03-16 08:30:57 -0700 (Sun, 16 Mar 2008)

Log Message:
-----------
Implemented opcode 34: o2_removeItemSlotFromInventory

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v2.h
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v2.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.h	2008-03-16 15:28:05 UTC (rev 31144)
+++ scummvm/trunk/engines/kyra/kyra_v2.h	2008-03-16 15:30:57 UTC (rev 31145)
@@ -970,6 +970,7 @@
 	int o2_displayWsaSequence(ScriptState *script);
 	int o2_addItemToCurScene(ScriptState *script);
 	int o2_checkForItem(ScriptState *script);
+	int o2_removeItemSlotFromInventory(ScriptState *script);
 	int o2_defineItem(ScriptState *script);
 	int o2_removeItemFromInventory(ScriptState *script);
 	int o2_countItemInInventory(ScriptState *script);

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-16 15:28:05 UTC (rev 31144)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-16 15:30:57 UTC (rev 31145)
@@ -351,6 +351,12 @@
 	return findItem(stackPos(0), stackPos(1)) == -1 ? 0 : 1;
 }
 
+int KyraEngine_v2::o2_removeItemSlotFromInventory(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "o2_removeItemSlotFromInventory(%p) (%d)", (const void *)script, stackPos(0));
+	removeItemFromInventory(stackPos(0));
+	return 0;
+}
+
 int KyraEngine_v2::o2_defineItem(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "o2_defineItem(%p) (%d, %d, %d, %d)", (const void *)script,
 			stackPos(0), stackPos(1), stackPos(2), stackPos(3));
@@ -1393,7 +1399,7 @@
 		// 0x20
 		Opcode(o2_checkForItem),
 		OpcodeUnImpl(),
-		OpcodeUnImpl(),
+		Opcode(o2_removeItemSlotFromInventory),
 		Opcode(o2_defineItem),
 		// 0x24
 		Opcode(o2_removeItemFromInventory),


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