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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Fri May 9 00:10:34 CEST 2008


Revision: 31957
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31957&view=rev
Author:   lordhoto
Date:     2008-05-08 15:10:34 -0700 (Thu, 08 May 2008)

Log Message:
-----------
Implemented opcode 66: o3_removeItemSlot.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_mr.h
    scummvm/trunk/engines/kyra/script_mr.cpp

Modified: scummvm/trunk/engines/kyra/kyra_mr.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.h	2008-05-08 21:23:14 UTC (rev 31956)
+++ scummvm/trunk/engines/kyra/kyra_mr.h	2008-05-08 22:10:34 UTC (rev 31957)
@@ -548,6 +548,7 @@
 	int o3_drawSceneShapeOnPage(EMCState *script);
 	int o3_checkInRect(EMCState *script);
 	int o3_updateConversations(EMCState *script);
+	int o3_removeItemSlot(EMCState *script);
 	int o3_setSceneDim(EMCState *script);
 	int o3_setSceneAnimPosAndFrame(EMCState *script);
 	int o3_removeItemInstances(EMCState *script);

Modified: scummvm/trunk/engines/kyra/script_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_mr.cpp	2008-05-08 21:23:14 UTC (rev 31956)
+++ scummvm/trunk/engines/kyra/script_mr.cpp	2008-05-08 22:10:34 UTC (rev 31957)
@@ -588,6 +588,13 @@
 	return 1;
 }
 
+int KyraEngine_MR::o3_removeItemSlot(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_removeItemSlot(%p) (%d)", (const void *)script, stackPos(0));
+	deleteItemAnimEntry(stackPos(0));
+	_itemList[stackPos(0)].id = 0xFFFF;
+	return 1;
+}
+
 int KyraEngine_MR::o3_setSceneDim(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_setSceneDim(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	_sceneMinX = stackPos(0);
@@ -1220,7 +1227,7 @@
 	// 0x40
 	Opcode(o3_checkInRect);
 	Opcode(o3_updateConversations);
-	OpcodeUnImpl();
+	Opcode(o3_removeItemSlot);
 	Opcode(o3_dummy);
 	// 0x44
 	Opcode(o3_dummy);


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




More information about the Scummvm-git-logs mailing list