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

[lordhoto at users.sourceforge.net]

Revision: 31185
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31185&view=rev
Author:   lordhoto
Date:     2008-03-18 11:20:13 -0700 (Tue, 18 Mar 2008)

Log Message:
-----------
Renamed opcode 95 to o2_showItemString.

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-18 18:07:05 UTC (rev 31184)
+++ scummvm/trunk/engines/kyra/kyra_v2.h	2008-03-18 18:20:13 UTC (rev 31185)
@@ -1031,7 +1031,7 @@
 	int o2_blockInRegion(ScriptState *script);
 	int o2_blockOutRegion(ScriptState *script);
 	int o2_setCauldronState(ScriptState *script);
-	int o2_showPickUpString(ScriptState *script);
+	int o2_showItemString(ScriptState *script);
 	int o2_getRand(ScriptState *script);
 	int o2_setDeathHandlerFlag(ScriptState *script);
 	int o2_setDrawNoShapeFlag(ScriptState *script);

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-18 18:07:05 UTC (rev 31184)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-18 18:20:13 UTC (rev 31185)
@@ -857,8 +857,8 @@
 	return 0;
 }
 
-int KyraEngine_v2::o2_showPickUpString(ScriptState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_showPickUpString(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_v2::o2_showItemString(ScriptState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_showItemString(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	const int item = stackPos(0);
 	
 	int string = 0;
@@ -1775,7 +1775,7 @@
 		Opcode(o2_blockOutRegion),
 		OpcodeUnImpl(),
 		Opcode(o2_setCauldronState),
-		Opcode(o2_showPickUpString),
+		Opcode(o2_showItemString),
 		// 0x60
 		Opcode(o2_getRand),
 		OpcodeUnImpl(),


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